fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See changelog 2002-01-10 22:10 UTC -0300

Browse Source
This commit is contained in:
Luiz Rafael Culik
2002-01-11 00:06:23 +00:00
parent 5d8411ecc6
commit 1325ddca24
4 changed files with 1033 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -7,6 +7,14 @@
For example:
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-10-01 22:10 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
2002-01-14 10:40 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
* source\common\hbffind.c
* source\rtl\direct.c
* modified for correct operation under NT
* including addition of extended file attributes
2002-01-12 19:00 UTC+0500 Phil Barnett <philb@the-oasis.net>
* tagged cvs with build38 and lifted cvs freeze
2002-01-12 14:20 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

126
harbour/source/common/hbffind.c
View File

@@ -118,6 +118,9 @@ HB_FILE_VER( "$Id$" )
{
DIR * dir;
struct dirent * entry;
char pfname[ _POSIX_PATH_MAX + 1 ];
char pfext[ _POSIX_PATH_MAX + 1 ];
} HB_FFIND_INFO, * PHB_FFIND_INFO;
#else
@@ -514,7 +517,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
/* Make sure we have this cleared */
ffind->info = NULL;
/* Do platform dependant first search */
#if defined(HB_OS_DOS)
@@ -590,21 +593,89 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
{
PHB_FFIND_INFO info;
char string[ _POSIX_PATH_MAX + 1 ];
char pattern[ _POSIX_PATH_MAX + 1 ];
char dirname[ _POSIX_PATH_MAX + 1 ];
char fname[ _POSIX_PATH_MAX + 1 ];
char fext[ _POSIX_PATH_MAX + 1 ];
char * pos;
ffind->info = ( void * ) hb_xgrab( sizeof( HB_FFIND_INFO ) );
info = ( PHB_FFIND_INFO ) ffind->info;
dirname[ 0 ] = '\0';
pattern[ 0 ] = '\0';
if( pszFileName )
{
strcpy( string, pszFileName );
pos = strrchr( string, OS_PATH_DELIMITER );
if( pos )
{
strcpy( pattern, pos + 1 );
*( pos + 1 ) = '\0';
strcpy( dirname, string );
}
else
{
strcpy( pattern, string );
strcpy( dirname, ".X" );
dirname[ 1 ] = OS_PATH_DELIMITER;
}
}
if( !*pattern )
strcpy( pattern, "*.*" );
if( strlen( pattern ) > 0 )
{
strcpy( string, pattern );
pos = strrchr( string, '.' );
if( pos )
{
strcpy( info->pfext, pos + 1 );
*pos = '\0';
strcpy( info->pfname, string );
}
else
{
strcpy( info->pfname, string );
info->pfext[ 0 ] = '\0';
}
}
if( strlen( info->pfname ) < 1 )
strcpy( info->pfname, "*" );
tzset();
info->dir = opendir( pszFileName );
info->dir = opendir( dirname );
if( info->dir )
{
info->entry = readdir( info->dir );
if( info->dir != NULL)
while( ( info->entry = readdir( info->dir ) ) != NULL ){
strcpy( string, info->entry->d_name );
pos = strrchr( string, OS_PATH_DELIMITER );
pos = strrchr( pos ? ( pos + 1 ) : string, '.' );
if( pos && ! ( pos == &string[ 0 ] ) )
{
strcpy( fext, pos + 1 );
*pos = '\0';
}
else
fext[ 0 ] = '\0';
pos = strrchr( string, OS_PATH_DELIMITER );
strcpy( fname, pos ? ( pos + 1 ) : string );
if( !*fname )
strcpy( fname, "*" );
/* TOFIX: uiAttr check */
bFound = ( info->entry != NULL );
if( hb_strMatchRegExp( fname, info->pfname ) && hb_strMatchRegExp( fext, info->pfext ) ) {
bFound=TRUE;
break;
}
}
else
bFound = FALSE;
@@ -680,7 +751,46 @@ BOOL hb_fsFindNext( PHB_FFIND ffind )
#elif defined(HB_OS_UNIX)
{
bFound = ( ( info->entry = readdir( info->dir ) ) != NULL );
char string[ _POSIX_PATH_MAX + 1 ];
char * pos;
char fname[ _POSIX_PATH_MAX + 1 ];
char fext[ _POSIX_PATH_MAX + 1 ];
BOOL bTest;
bFound=FALSE;
while( ( info->entry = readdir( info->dir ) ) != NULL )
{
strcpy( string, info->entry->d_name );
pos = strrchr( string, OS_PATH_DELIMITER );
pos = strrchr( pos ? ( pos + 1 ) : string, '.' );
if( pos && ! ( pos == &string[ 0 ] ) )
{
strcpy( fext, pos + 1 );
*pos = '\0';
}
else
fext[ 0 ] = '\0';
pos = strrchr( string, OS_PATH_DELIMITER );
strcpy( fname, pos ? ( pos + 1 ) : string );
if( !*fname )
strcpy( fname, "*" );
/* TOFIX: uiAttr check */
bTest=hb_strMatchRegExp( fname, info->pfname ) && hb_strMatchRegExp( fext, info->pfext ) ;
if (bTest)
{
bFound=TRUE;
break;
}
}
}
#elif defined(HB_OS_MAC)

1749
harbour/source/rtl/listbox.prg
View File

File diff suppressed because it is too large Load Diff

8
harbour/utils/hbmake/hbmutils.prg
View File

@@ -17,7 +17,7 @@ Function GetSourceFiles( lSubdir )
Local adirs AS ARRAY
Local aRet AS ARRAY := {}
Local lLinux := At( 'linux', Os() ) > 0
Local lLinux := At( 'linux', lower(Os() )) > 0
Local cdir as String := If( !llinux, '\' + Curdir() + '\', '/' + Curdir() + '/' )
Local aStru := { cDir }
Local aData AS ARRAY
@@ -32,6 +32,7 @@ Function GetSourceFiles( lSubdir )
Local nPos
Local xItem
Default lSubdir To .t.
While ++ nCounter <= Len( aStru )
If !Empty( adirs := GetDirs( astru[ nCounter ] ) ) // There are elements!
@@ -65,6 +66,7 @@ Function GetSourceFiles( lSubdir )
Next
Endif
Next
For nCounter := 1 To Len( aret )
xItem := Substr( aret[ nCounter ], Rat( If( llinux, "/", '\' ), aret[ nCounter ] ) + 1 )
@@ -114,7 +116,7 @@ Return ctemp
Static Function GetDirs( cPattern )
Local aDir := {}
Local lLinux := At( 'linux', Os() ) > 0
Local lLinux := At( 'linux', lower(Os()) ) > 0
Aeval( Directory( cPattern + "*.", "D" ), ;
{ | xItem | If( xItem[ 5 ] = "D" .and. ;
( xItem[ 1 ] != "." .and. xItem[ 1 ] != ".." ), ;
@@ -201,7 +203,7 @@ Return cPath
Function GetSourceDirMacros()
Local adirs AS ARRAY
Local lLinux := At( 'linux', Os() ) > 0
Local lLinux := At( 'linux', lower(Os()) ) > 0
Local cdir as String := If( llinux, '/' + Curdir() + '/', '\' + Curdir() + '\' )
Local aStru := { cDir }