*** empty log message ***
This commit is contained in:
@@ -1,3 +1,24 @@
|
||||
19990915-03:40 EDT Paul Tucker <ptucker@sympatico.ca>
|
||||
* source/rtl/dir.c
|
||||
* Now Clipper compatible results are returned.
|
||||
definately with MSVC - most likely with compilers running under MS OS.
|
||||
since I'm not familliar with any quirks with those compilers I made
|
||||
almost no changes to compiler specific code. I suspect though that
|
||||
there may be problems when passing a full path with wildcard to
|
||||
Directory() - please test.
|
||||
+ You can now get the 8.3 filename (msvc again) for true Clipper
|
||||
compatibible return results by passing a logical as the new 3rd
|
||||
parameter. The default is .f. which gives full long filenames
|
||||
+ Add a number of static funcs like HarbourMaskToAttributes() to
|
||||
convert "DHS" to something the os understands.
|
||||
! Where this all falls apart is for OS_UNIX_COMPATIBLE.
|
||||
I don't know what to do about translating Hidden or System files.
|
||||
and not too sure how to handle Readonly.
|
||||
Nobody commented when I posted the code - so here is what I came up
|
||||
with.
|
||||
* tests/working/dirtest.prg
|
||||
+ added 3rd parameter to indicate 'want 8.3 filenames'
|
||||
|
||||
19990915-03:20 GMT+1 Victor Szel <info@szelvesz.hu>
|
||||
* source/rtl/do.c
|
||||
- Previous fix undone, since it was causing other problems.
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
* by the optional file and attribute mask.
|
||||
*
|
||||
* Latest mods:
|
||||
* 1.46 19990915 ptucker Return results are now fully compatible
|
||||
* particularly using MSVC - other os's need
|
||||
* testing.
|
||||
* Converted attribute handling and Added
|
||||
* conversion functions.
|
||||
* 1.44 19990911 dholm Changed file size to numeric, like Clipper.
|
||||
* 1.28 19990722 ptucker Corrected? NT Extended modes.
|
||||
* 1.21 19990722 ptucker Implimented directory for MSVC.
|
||||
@@ -15,12 +20,58 @@
|
||||
* been requested.
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* Notes from the fringe... <ptucker@sympatico.ca>
|
||||
*
|
||||
* Clipper is a bit schizoid with the treatment of file attributes, but we've
|
||||
* emulated that weirdness here for your viewing amusement.
|
||||
*
|
||||
* In Clippers' homeworld of DOS, there are essentially 5 basic attributes:
|
||||
* 'A'rchive, 'H'idden, 'S'ystem, 'R'eadonly and 'D'irectory. In addition, a
|
||||
* file can have no attributes, and only 1 file can have the 'V'olume label.
|
||||
*
|
||||
* For a given file request, you will receive any files that match the
|
||||
* passed filemask. Included in this list are files which have attributes
|
||||
* matching the requested attribute as well as files that have no attribute,
|
||||
* or that have the 'A'rchive, or 'R'eadOnly attribute.
|
||||
*
|
||||
* The exception is Directory entries - these will always be excluded
|
||||
* even if they have the requested bit set. (Unless of course, you request "D"
|
||||
* as an attribute as well)
|
||||
*
|
||||
* The only valid characters that can be passed as an attribute request are
|
||||
* any of "DHS". Anything else is already implied, so it is ignored. Except
|
||||
* under NT, which may accept other attributes, but it is still a work in
|
||||
* progress - NT that is ;-).
|
||||
*
|
||||
* "V" is also valid, but is a special case - you will get back 1 entry only
|
||||
* that describes the volume label for the drive implied by the filemask.
|
||||
*
|
||||
* Differences from the 'standard':
|
||||
* Where supported, filenames will be returned in the same case as they
|
||||
* are stored in the directory. Clipper (and VO too) will convert the
|
||||
* names to upper case.
|
||||
* Where supported, filenames will be the full filename as supported by
|
||||
* the os in use. Under an MS Windows implimentation, an optional
|
||||
* 3rd parameter to Directory will allow you to receive the normal '8.3'
|
||||
* filename.
|
||||
*
|
||||
* TODO: - Volume label support
|
||||
* - check that path support vis stat works on all platforms
|
||||
* - UNC Support? ie: dir \\myserver\root
|
||||
*
|
||||
*/
|
||||
|
||||
#if defined(__IBMCPP__)
|
||||
#define INCL_DOSFILEMGR
|
||||
#define INCL_DOSERRORS
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
#include "extend.h"
|
||||
#include "itemapi.h"
|
||||
@@ -108,32 +159,249 @@
|
||||
#endif
|
||||
|
||||
#if !defined(FA_RDONLY)
|
||||
#define FA_RDONLY 1
|
||||
#define FA_HIDDEN 2
|
||||
#define FA_SYSTEM 4
|
||||
#define FA_LABEL 8
|
||||
#define FA_DIREC 16
|
||||
#define FA_ARCH 32
|
||||
#define FA_RDONLY 1 /* R */
|
||||
#define FA_HIDDEN 2 /* H */
|
||||
#define FA_SYSTEM 4 /* S */
|
||||
#define FA_LABEL 8 /* V */
|
||||
#define FA_DIREC 16 /* D */
|
||||
#define FA_ARCH 32 /* A */
|
||||
#endif
|
||||
/* this may not work, but lets find out (only implimented for msvc) */
|
||||
/* these work under NT but are otherwise used as placeholders for
|
||||
non MS o/s support */
|
||||
#if !defined(FA_ENCRYPTED)
|
||||
#define FA_ENCRYPTED 64
|
||||
#define FA_NORMAL 128
|
||||
#define FA_TEMPORARY 256
|
||||
#define FA_SPARSE 512
|
||||
#define FA_REPARSE 1024
|
||||
#define FA_COMPRESSED 2048
|
||||
#define FA_OFFLINE 4096
|
||||
#define FA_NOTINDEXED 8192
|
||||
#define FA_VOLCOMP 32764
|
||||
#define FA_DEVICE 64 /* I */
|
||||
#define FA_NORMAL 128 /* N */ // ignored
|
||||
#define FA_TEMPORARY 256 /* T */
|
||||
#define FA_SPARSE 512 /* P */
|
||||
#define FA_REPARSE 1024 /* L */
|
||||
#define FA_COMPRESSED 2048 /* C */
|
||||
#define FA_OFFLINE 4096 /* O */
|
||||
#define FA_NOTINDEXED 8192 /* X */
|
||||
#define FA_ENCRYPTED 16384 /* E */
|
||||
#define FA_VOLCOMP 32768 /* M */
|
||||
#endif
|
||||
|
||||
/* Conversion functions *** commented out functions not finished-not needed */
|
||||
static USHORT osToHarbourMask( USHORT usMask )
|
||||
{
|
||||
USHORT usRetMask;
|
||||
|
||||
usRetMask = usMask;
|
||||
|
||||
#if defined(OS_UNIX_COMPATIBLE)
|
||||
/* The use of any particular FA_ define here is meaningless */
|
||||
/* they are essentially placeholders */
|
||||
usRetMask = 0;
|
||||
if( S_ISREG( usMask ) )
|
||||
usRetMask |= FA_ARCH; /* A */
|
||||
if( S_ISDIR( usMask ) )
|
||||
usRetMask |= FA_DIREC; /* D */
|
||||
if( S_ISLNK( usMask ) )
|
||||
usRetMask |= FA_REPARSE; /* L */
|
||||
if( S_ISCHR( usMask ) )
|
||||
usRetMask |= FA_COMPRESSED; /* C */
|
||||
if( S_ISBLK( usMask ) )
|
||||
usRetMask |= FA_DEVICE; /* B (I) */
|
||||
if( S_ISFIFO( usMask ) )
|
||||
usRetMask |= FA_TEMPORARY; /* F (T) */
|
||||
if( S_ISSOCK( usMask ) )
|
||||
usRetMask |= FA_SPARSE; /* K (P) */
|
||||
#else
|
||||
#if defined(__IBMCPP__)
|
||||
usRetMask = 0;
|
||||
if( usMask & FILE_ARCHIVED )
|
||||
usRetMask |= FA_ARCH;
|
||||
if( usMask & FILE_DIRECTORY )
|
||||
usRetMask |= FA_DIREC;
|
||||
if( usMask & FILE_HIDDEN )
|
||||
usRetMask |= FA_HIDDEN;
|
||||
if( usMask & FILE_RDONLY )
|
||||
usRetMask |= FA_READONLY;
|
||||
if( usMask & FILE_SYSTEM )
|
||||
usRetMask |= FA_SYSTEM;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
return usRetMask;
|
||||
}
|
||||
|
||||
static USHORT HarbourToOsMask( USHORT usMask )
|
||||
{
|
||||
USHORT usRetMask = usMask;
|
||||
|
||||
#if defined(OS_UNIX_COMPATIBLE)
|
||||
/* TODO: Need to look into this one */
|
||||
/* what to do with Hidden and System? */
|
||||
|
||||
usRetMask = 0;
|
||||
if( usMask & FA_ARCH )
|
||||
usRetMask = S_ISREG; /* 0x0000 (numbers as in ms impimentation) */
|
||||
if( usMask & FA_DIREC )
|
||||
usRetMask |= S_IFDIR; /* 0x3000 */
|
||||
if( usMask & FA_REPARSE )
|
||||
usRetMask |= S_IFLNK; /* -not in ms- cygwin=120000 decimal */
|
||||
if( usMask & FA_COMPRESSED )
|
||||
usRetMask |= S_IFCHR; /* 0x2000 */
|
||||
if( usMask & FA_DEVICE ) /* s_isblk... */
|
||||
usRetMask |= S_IFBLK; /* 0x1000 */
|
||||
if( usMask & FA_TEMPORARY ) /* s_isfifo... */
|
||||
usRetMask |= S_IFIFO; /* 0x4000 */
|
||||
if( usMask & FA_SPARSE ) /* s_issock... */
|
||||
usRetMask |= S_IFSOCK; /* -not in ms- cygwin=140000 decimal! */
|
||||
if( usMask & FA_LABEL )
|
||||
usRetMask |= S_IFLABEL; /* 0x5000 */
|
||||
if( usMask & FA_RDONLY )
|
||||
usRetMask ~= S_IRUSR; /* ??? - want to mask off this bit */
|
||||
|
||||
#else
|
||||
#if defined(__IBMCPP__)
|
||||
/* TODO: Need more! -> FA_LABEL */
|
||||
usRetMask = 0;
|
||||
if( usMask & FA_ARCH )
|
||||
usRetMask |= FILE_ARCHIVED;
|
||||
if( usMask & FA_DIREC )
|
||||
usRetMask |= FILE_DIRECTORY;
|
||||
if( usMask & FA_HIDDEN )
|
||||
usRetMask |= FILE_HIDDEN;
|
||||
if( usMask & FA_READONLY )
|
||||
usRetMask |= FILE_RDONLY;
|
||||
if( usMask & FA_SYSTEM )
|
||||
usRetMask |= FILE_SYSTEM;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
return usRetMask;
|
||||
}
|
||||
|
||||
/*
|
||||
static USHORT osAttributesToMask( BYTE *byAttrib )
|
||||
{
|
||||
USHORT usRetMask = 0;
|
||||
|
||||
#if defined(OS_UNIX_COMPATIBLE)
|
||||
#else
|
||||
#if defined(__IBMCPP__)
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#elif defined(__BORLANDC__) || defined(__DJGPP__)
|
||||
#else
|
||||
#endif
|
||||
#if defined(USE_NT)
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
return usRetMask;
|
||||
}
|
||||
|
||||
static BYTE *osMaskToAttributes( USHORT usMask, BYTE *byAttrib )
|
||||
{
|
||||
char *cAttrib = (char *)byAttrib;
|
||||
|
||||
#if defined(OS_UNIX_COMPATIBLE)
|
||||
#else
|
||||
#if defined(__IBMCPP__)
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#elif defined(__BORLANDC__) || defined(__DJGPP__)
|
||||
#else
|
||||
#endif
|
||||
#if defined(USE_NT)
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
return byAttrib;
|
||||
}
|
||||
*/
|
||||
|
||||
static USHORT HarbourAttributesToMask( BYTE *byAttrib )
|
||||
{
|
||||
BYTE *pos = byAttrib;
|
||||
BYTE c;
|
||||
USHORT usMask = 0;
|
||||
|
||||
while ( c=toupper( *pos++ ) )
|
||||
{
|
||||
switch (c)
|
||||
{
|
||||
case 'A': usMask |= FA_ARCH; break;
|
||||
case 'D': usMask |= FA_DIREC; break;
|
||||
case 'H': usMask |= FA_HIDDEN; break;
|
||||
case 'R': usMask |= FA_RDONLY; break;
|
||||
case 'S': usMask |= FA_SYSTEM; break;
|
||||
case 'V': usMask |= FA_LABEL; break;
|
||||
/* extensions */
|
||||
/* case 'N': usMask |= FA_NORMAL; break; */
|
||||
case 'O': usMask |= FA_OFFLINE; break;
|
||||
case 'T': usMask |= FA_TEMPORARY; break;
|
||||
case 'I': usMask |= FA_DEVICE; break;
|
||||
case 'M': usMask |= FA_VOLCOMP; break;
|
||||
case 'E': usMask |= FA_ENCRYPTED; break;
|
||||
case 'X': usMask |= FA_NOTINDEXED; break;
|
||||
case 'C': usMask |= FA_COMPRESSED; break;
|
||||
case 'L': usMask |= FA_REPARSE; break;
|
||||
case 'P': usMask |= FA_SPARSE; break;
|
||||
}
|
||||
}
|
||||
return usMask;
|
||||
}
|
||||
|
||||
static BYTE *HarbourMaskToAttributes( USHORT usMask, BYTE *byAttrib )
|
||||
{
|
||||
char * cAttrib = (char *)byAttrib;
|
||||
|
||||
*cAttrib = '\0';
|
||||
if( usMask & FA_RDONLY )
|
||||
strcat( cAttrib,"R" );
|
||||
if( usMask & FA_DIREC )
|
||||
strcat( cAttrib,"D" );
|
||||
if( usMask & FA_HIDDEN )
|
||||
strcat( cAttrib,"H" );
|
||||
if( usMask & FA_SYSTEM )
|
||||
strcat( cAttrib,"S" );
|
||||
if( usMask & FA_ARCH )
|
||||
strcat( cAttrib,"A" );
|
||||
if( usMask & FA_LABEL )
|
||||
{
|
||||
strcat( cAttrib, "V" );
|
||||
if( usMask & FA_VOLCOMP )
|
||||
strcat( cAttrib, "M" ); /* volume supports compression. */
|
||||
}
|
||||
/* thse can be returned under NT with NTFS - I picked the letters to use.*/
|
||||
/* needs testing on a Novell drive */
|
||||
/* PLEASE! If these cause you trouble let me know! <ptucker@sympatico.ca> */
|
||||
|
||||
if( usMask & FA_DEVICE )
|
||||
strcat( cAttrib, "I" );
|
||||
/* if( usMask & FA_NORMAL ) */
|
||||
/* strcat( cAttrib, "N" ); */
|
||||
if( usMask & FA_TEMPORARY )
|
||||
strcat( cAttrib, "T" );
|
||||
if( usMask & FA_SPARSE )
|
||||
strcat( cAttrib, "P" );
|
||||
if( usMask & FA_REPARSE )
|
||||
strcat( cAttrib, "L" );
|
||||
if( usMask & FA_COMPRESSED )
|
||||
strcat( cAttrib, "C" );
|
||||
if( usMask & FA_OFFLINE )
|
||||
strcat( cAttrib, "O" );
|
||||
if( usMask & FA_NOTINDEXED )
|
||||
strcat( cAttrib, "X" );
|
||||
if( usMask & FA_ENCRYPTED )
|
||||
strcat( cAttrib, "E" );
|
||||
|
||||
return byAttrib;
|
||||
}
|
||||
|
||||
|
||||
HARBOUR HB_DIRECTORY( void )
|
||||
{
|
||||
#if defined(HAVE_POSIX_IO)
|
||||
|
||||
PHB_ITEM arg1_it = hb_param( 1, IT_STRING );
|
||||
PHB_ITEM arg2_it = hb_param( 2, IT_STRING );
|
||||
PHB_ITEM arg3_it = hb_param( 3, IT_LOGICAL );
|
||||
|
||||
struct stat statbuf;
|
||||
struct tm * ft;
|
||||
@@ -161,15 +429,17 @@ HARBOUR HB_DIRECTORY( void )
|
||||
char pfext[ _POSIX_PATH_MAX + 1 ];
|
||||
char fname[ _POSIX_PATH_MAX + 1 ];
|
||||
char fext[ _POSIX_PATH_MAX + 1 ];
|
||||
BOOL blEightDotThree = FALSE;
|
||||
char ddate[ 9 ];
|
||||
char ttime[ 9 ];
|
||||
char aatrib[ 8 ];
|
||||
char aatrib[ 17 ];
|
||||
int attrib;
|
||||
long fsize;
|
||||
time_t ftime;
|
||||
char * pos;
|
||||
int iDirnameLen;
|
||||
|
||||
USHORT usosMask;
|
||||
USHORT ushbMask = FA_ARCH;
|
||||
PHB_ITEM pdir;
|
||||
PHB_ITEM psubarray;
|
||||
PHB_ITEM pfilename;
|
||||
@@ -181,25 +451,61 @@ HARBOUR HB_DIRECTORY( void )
|
||||
dirname[ 0 ] = '\0';
|
||||
pattern[ 0 ] = '\0';
|
||||
|
||||
if( arg1_it )
|
||||
/* Get the passed attributes and convert them to Harbour Flags */
|
||||
if( arg2_it && hb_parclen( 2 ) >= 1 )
|
||||
ushbMask |= HarbourAttributesToMask( (BYTE *)hb_parc( 2 ) );
|
||||
|
||||
/* Translate Harbour Flags into OS specific flags */
|
||||
usosMask = HarbourToOsMask( ushbMask );
|
||||
|
||||
/* Do we want 8.3 support? */
|
||||
if( arg3_it )
|
||||
blEightDotThree = ( hb_parl( 3 ) ? TRUE :FALSE );
|
||||
|
||||
pattern[0] = '\0';
|
||||
|
||||
/* TODO: add supporting code */
|
||||
/* if you request the volume label, that's all you get */
|
||||
if( ushbMask & FA_LABEL )
|
||||
{
|
||||
strcpy( string, hb_parc( 1 ) );
|
||||
pos = strrchr( string, OS_PATH_DELIMITER );
|
||||
if( pos )
|
||||
{
|
||||
strcpy( pattern, pos + 1 );
|
||||
*( pos + 1 ) = '\0';
|
||||
strcpy( dirname, string );
|
||||
}
|
||||
else
|
||||
/* get rid of anything else */
|
||||
ushbMask = FA_LABEL;
|
||||
|
||||
if( arg1_it )
|
||||
{
|
||||
strcpy( string, hb_parc( 1 ) );
|
||||
pos = strrchr( string, ':' );
|
||||
if( pos )
|
||||
*(++pos) = '\0';
|
||||
else
|
||||
string[0] = '\0';
|
||||
|
||||
strcpy( pattern, string );
|
||||
strcpy( dirname, ".X" );
|
||||
dirname[ 1 ] = OS_PATH_DELIMITER;
|
||||
}
|
||||
}
|
||||
if( strlen( pattern ) < 1 )
|
||||
strcpy( pattern, "*.*" );
|
||||
else
|
||||
{
|
||||
if( arg1_it )
|
||||
{
|
||||
strcpy( string, hb_parc( 1 ) );
|
||||
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, "*.*" );
|
||||
}
|
||||
|
||||
iDirnameLen = strlen( dirname );
|
||||
if( iDirnameLen < 1 )
|
||||
{
|
||||
@@ -225,11 +531,6 @@ HARBOUR HB_DIRECTORY( void )
|
||||
}
|
||||
}
|
||||
|
||||
/* redundant
|
||||
if( strlen( pfext ) < 1 )
|
||||
pfext[ 0 ] = '\0';
|
||||
*/
|
||||
|
||||
if( strlen( pfname ) < 1 )
|
||||
strcpy( pfname, "*" );
|
||||
|
||||
@@ -237,7 +538,7 @@ HARBOUR HB_DIRECTORY( void )
|
||||
printf( "\n dirname pattern %s %s ", dirname, pattern );
|
||||
printf( "\n pfname pfext %s %s ", pfname, pfext );
|
||||
while( 0 == getchar() );
|
||||
*/
|
||||
*/
|
||||
/* should have drive,directory in dirname and filespec in pattern */
|
||||
|
||||
tzset();
|
||||
@@ -247,12 +548,19 @@ HARBOUR HB_DIRECTORY( void )
|
||||
|
||||
strcpy( string, dirname );
|
||||
strcat( string, pattern );
|
||||
|
||||
if( ( hFile = _findfirst( string, &entry ) ) != -1L )
|
||||
{
|
||||
|
||||
do
|
||||
{
|
||||
strcpy( string, entry.name );
|
||||
strcpy( string, dirname );
|
||||
strcat( string, entry.name );
|
||||
|
||||
/* this needs the full path to the file */
|
||||
if( blEightDotThree )
|
||||
GetShortPathName( string, string, _POSIX_PATH_MAX );
|
||||
|
||||
#elif defined(__IBMCPP__)
|
||||
strcpy( string, dirname );
|
||||
strcat( string, pattern );
|
||||
@@ -284,46 +592,73 @@ HARBOUR HB_DIRECTORY( void )
|
||||
strcpy( string, entry->d_name );
|
||||
|
||||
#endif
|
||||
pos = strrchr( string, '.' );
|
||||
pos = strrchr( string, OS_PATH_DELIMITER );
|
||||
if( pos )
|
||||
pos = strrchr( pos+1, '.' );
|
||||
else
|
||||
pos = strrchr( string, '.' );
|
||||
|
||||
if( pos && !(pos==&string[0]) )
|
||||
{
|
||||
strcpy( fext, pos + 1 );
|
||||
*pos = '\0';
|
||||
strcpy( fname, string );
|
||||
}
|
||||
else
|
||||
{
|
||||
fext[ 0 ] = '\0';
|
||||
|
||||
pos = strrchr( string, OS_PATH_DELIMITER );
|
||||
if( pos )
|
||||
strcpy( fname, pos +1 );
|
||||
else
|
||||
strcpy( fname, string );
|
||||
fext[ 0 ] = '\0';
|
||||
}
|
||||
|
||||
/* redundant
|
||||
if( strlen( fext ) < 1 )
|
||||
fext[ 0 ] = '\0';
|
||||
*/
|
||||
|
||||
if( strlen( fname ) < 1 )
|
||||
if( !*fname )
|
||||
strcpy( fname, "*" );
|
||||
|
||||
/* debug code
|
||||
printf( "\n fname fext %s %s ", fname, fext );
|
||||
printf( "\n fname: %s fext: %s ", fname, fext );
|
||||
while( 0 == getchar() );
|
||||
*/
|
||||
if( hb_strMatchRegExp( fname, pfname ) && hb_strMatchRegExp( fext, pfext ) )
|
||||
{
|
||||
attrib = 0;
|
||||
aatrib[ 0 ] = '\0';
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
strcpy( filename, entry.name );
|
||||
/* due to short-name support: reconstruct the filename */
|
||||
if( blEightDotThree )
|
||||
{
|
||||
pos = strrchr( string, OS_PATH_DELIMITER );
|
||||
if( pos )
|
||||
{
|
||||
++pos;
|
||||
if( !*pos || (*pos == '.' && !pos[1] ))
|
||||
strcat( string, "." );
|
||||
}
|
||||
strcpy( filename, string ); /* entry.name ); */
|
||||
|
||||
if( *fext )
|
||||
{
|
||||
strcat( filename, "." );
|
||||
strcat( filename, fext );
|
||||
}
|
||||
*fullfile = '\0';
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpy( fullfile, dirname );
|
||||
strcpy( filename, entry.name );
|
||||
}
|
||||
|
||||
#elif defined(__IBMCPP__)
|
||||
strcpy( filename, entry.achName );
|
||||
strcpy( fullfile, dirname );
|
||||
#else
|
||||
strcpy( filename, entry->d_name );
|
||||
#endif
|
||||
strcpy( fullfile, dirname );
|
||||
#endif
|
||||
strcat( fullfile, filename );
|
||||
|
||||
|
||||
if( -1 == stat( fullfile, &statbuf ) )
|
||||
{
|
||||
/* TODO: proper error handling */
|
||||
@@ -332,10 +667,41 @@ HARBOUR HB_DIRECTORY( void )
|
||||
}
|
||||
else
|
||||
{
|
||||
/* This might be a problem under Novell when the file is a directory */
|
||||
/* needs test */
|
||||
fsize = statbuf.st_size;
|
||||
ftime = statbuf.st_mtime;
|
||||
|
||||
#if defined(OS_UNIX_COMPATIBLE)
|
||||
/* GNU C on Linux or on other UNIX */
|
||||
attrib = osToHarbourMask( statbuf.st_mode );
|
||||
#else
|
||||
#if defined(__IBMCPP__)
|
||||
attrib = entry.attrFile;
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
attrib = entry.attrib;
|
||||
if( blEightDotThree )
|
||||
{
|
||||
/* need to strip off the path */
|
||||
pos = strrchr( filename, OS_PATH_DELIMITER );
|
||||
if( pos )
|
||||
strcpy( filename, ++pos );
|
||||
}
|
||||
#elif defined(__BORLANDC__) || defined(__DJGPP__)
|
||||
attrib = _chmod( fullfile, 0 );
|
||||
#else
|
||||
attrib = 0;
|
||||
#endif
|
||||
#endif
|
||||
attrib = osToHarbourMask( attrib );
|
||||
if( attrib & FA_DIREC )
|
||||
{
|
||||
/* MS says size for a Directory is undefined.
|
||||
Novell uses these bits for other purposes
|
||||
*/
|
||||
fsize = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
ft = localtime( &ftime );
|
||||
sprintf( ddate, "%04d%02d%02d",
|
||||
ft->tm_year + 1900, ft->tm_mon + 1, ft->tm_mday );
|
||||
@@ -351,103 +717,16 @@ HARBOUR HB_DIRECTORY( void )
|
||||
|
||||
}
|
||||
|
||||
#if defined(OS_UNIX_COMPATIBLE)
|
||||
/* GNU C on Linux or on other UNIX */
|
||||
aatrib[ 0 ] = '\0';
|
||||
if( S_ISREG( statbuf.st_mode ) )
|
||||
strcat( aatrib, "A" );
|
||||
if( S_ISDIR( statbuf.st_mode ) )
|
||||
strcat( aatrib, "D" );
|
||||
if( S_ISLNK( statbuf.st_mode ) )
|
||||
strcat( aatrib, "L" );
|
||||
if( S_ISCHR( statbuf.st_mode ) )
|
||||
strcat( aatrib, "C" );
|
||||
if( S_ISBLK( statbuf.st_mode ) )
|
||||
strcat( aatrib, "B" );
|
||||
if( S_ISFIFO( statbuf.st_mode ) )
|
||||
strcat( aatrib, "F" );
|
||||
if( S_ISSOCK( statbuf.st_mode ) )
|
||||
strcat( aatrib, "K" );
|
||||
#else
|
||||
#if defined(__IBMCPP__)
|
||||
attrib = entry.attrFile;
|
||||
if( attrib & FILE_ARCHIVED )
|
||||
strcat( aatrib, "A" );
|
||||
if( attrib & FILE_DIRECTORY )
|
||||
strcat( aatrib, "D" );
|
||||
if( attrib & FILE_HIDDEN )
|
||||
strcat( aatrib, "H" );
|
||||
if( attrib & FILE_READONLY )
|
||||
strcat( aatrib, "R" );
|
||||
if( attrib & FILE_SYSTEM )
|
||||
strcat( aatrib, "S" );
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
attrib = entry.attrib;
|
||||
#elif defined(__BORLANDC__) || defined(__DJGPP__)
|
||||
attrib = _chmod( fullfile, 0 );
|
||||
#else
|
||||
attrib = 0;
|
||||
#endif
|
||||
if( attrib & FA_ARCH )
|
||||
strcat( aatrib, "A" );
|
||||
if( attrib & FA_DIREC )
|
||||
strcat( aatrib,"D" );
|
||||
if( attrib & FA_HIDDEN )
|
||||
strcat( aatrib,"H" );
|
||||
if( attrib & FA_RDONLY )
|
||||
strcat( aatrib,"R" );
|
||||
if( attrib & FA_SYSTEM )
|
||||
strcat( aatrib,"S" );
|
||||
if( attrib & FA_LABEL )
|
||||
{
|
||||
strcat( aatrib, "V" );
|
||||
if( attrib & FA_VOLCOMP )
|
||||
strcat( aatrib, "L" ); /* volume supports compression. */
|
||||
}
|
||||
/* some of these are known to work under NT - I picked the letters to use.*/
|
||||
/* needs testing on a Novell drive */
|
||||
#if defined(USE_NT)
|
||||
if( attrib & FA_ENCRYPTED )
|
||||
strcat( aatrib, "E" );
|
||||
/* if( attrib & FA_NORMAL ) */
|
||||
/* strcat( aatrib, "N" ); */
|
||||
if( attrib & FA_TEMPORARY )
|
||||
strcat( aatrib, "T" );
|
||||
if( attrib & FA_SPARSE )
|
||||
strcat( aatrib, "P" );
|
||||
if( attrib & FA_REPARSE )
|
||||
strcat( aatrib, "Z" );
|
||||
if( attrib & FA_COMPRESSED )
|
||||
strcat( aatrib, "C" );
|
||||
if( attrib & FA_OFFLINE )
|
||||
strcat( aatrib, "O" );
|
||||
if( attrib & FA_NOTINDEXED )
|
||||
strcat( aatrib, "X" );
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
/* TODO: attribute match rtn */
|
||||
pos = string;
|
||||
if( arg2_it && hb_parclen( 2 ) >= 1 )
|
||||
{
|
||||
strcpy( string, hb_parc( 2 ) );
|
||||
while( *pos != '\0' )
|
||||
{
|
||||
*pos = ( char ) toupper( *pos );
|
||||
pos++;
|
||||
}
|
||||
pos = strchr( string, *aatrib );
|
||||
}
|
||||
|
||||
if( pos || !attrib)
|
||||
if(!(( ushbMask & FA_HIDDEN ) == 0 && ( attrib & FA_HIDDEN ) > 0 ||
|
||||
( ushbMask & FA_SYSTEM ) == 0 && ( attrib & FA_SYSTEM ) > 0 ||
|
||||
( ushbMask & FA_DIREC ) == 0 && ( attrib & FA_DIREC ) > 0 ))
|
||||
{
|
||||
/* array cname, csize, ddate, ctime, cattributes */
|
||||
pfilename = hb_itemPutC( NULL, filename );
|
||||
psize = hb_itemPutNL( NULL, fsize );
|
||||
pdate = hb_itemPutDS( NULL, ddate );
|
||||
ptime = hb_itemPutC( NULL, ttime );
|
||||
pattr = hb_itemPutC( NULL, aatrib );
|
||||
pattr = hb_itemPutC( NULL, (char *)HarbourMaskToAttributes(attrib, (BYTE *)aatrib) );
|
||||
psubarray = hb_itemArrayNew( 5 );
|
||||
hb_itemArrayPut( psubarray, 1, pfilename );
|
||||
hb_itemArrayPut( psubarray, 2, psize );
|
||||
|
||||
@@ -3,20 +3,24 @@
|
||||
//
|
||||
|
||||
// directory test
|
||||
function main(filespec,attribs)
|
||||
function main(filespec,attribs,cshort)
|
||||
|
||||
local adir := {}
|
||||
local x := 0
|
||||
local x := 0, lShort := .f.
|
||||
local cOs := OS(), cNewLine
|
||||
|
||||
IF !cshort == NIL .and. (Upper( cShort ) == "TRUE" .or. Upper( cShort ) == ".T.")
|
||||
lShort := .t.
|
||||
ENDIF
|
||||
|
||||
IF "OS/2" $ cOs .OR. "WIN" $ cOs .OR. "DOS" $ cOs
|
||||
cNewLine := CHR( 13 ) + CHR( 10 )
|
||||
ELSE
|
||||
cNewLine := CHR( 10 )
|
||||
END IF
|
||||
|
||||
// adir := asort( directory(filespec,attribs),,, {|x,y|upper(x[1]) < upper(y[1])} )
|
||||
adir := directory(filespec,attribs)
|
||||
//adir := asort( directory(filespec,attribs,lShort),,, {|x,y|upper(x[1]) < upper(y[1])} )
|
||||
adir := directory(filespec,attribs,lShort)
|
||||
|
||||
SET CENTURY ON
|
||||
|
||||
|
||||
Reference in New Issue
Block a user