diff --git a/direntx.c b/direntx.c deleted file mode 100644 index ec4a248d..00000000 --- a/direntx.c +++ /dev/null @@ -1,472 +0,0 @@ -/* - * dirent.c - * - * This file has no copyright assigned and is placed in the Public Domain. - * - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Derived from DIRLIB.C by Matt J. Weinstein - * This note appears in the DIRLIB.H - * DIRLIB.H by M. J. Weinstein Released to public domain 1-Jan-89 - * - * Updated by Jeremy Bettis - * Significantly revised and rewinddir, seekdir and telldir added - * by Colin Peters - * Further significantly revised for improved memory utilisation, - * efficiency in operation, and better POSIX standards compliance - * by Keith Marshall - * - */ -#include -#include -#include -#include -#include - -extern "C" { -_CRTIMP char* __cdecl __MINGW_NOTHROW _fullpath (char*, const char*, size_t); -} - -#define WIN32_LEAN_AND_MEAN -#include -#include - -#define DIRENT_RETURN_NOTHING -#define DIRENT_REJECT( chk, err, rtn ) \ - do { if( chk ){ errno = (err); return rtn; }} while(0) - -union __dirstream_t -{ - /* Actual (private) declaration for opaque data type "DIR". */ - - /* dirent struct to return from dir (NOTE: this makes this thread - * safe as long as only one thread uses a particular DIR struct at - * a time) */ - struct dirent dd_dir; - - struct __dirstream_private_t - { - /* Three padding fields, matching the head of dd_dir... - */ - long dd_ino; /* Always zero. */ - unsigned short dd_reclen; /* Always zero. */ - unsigned short dd_namlen; /* Length of name in d_name. */ - - /* ...to keep the start of this disk transfer area for this dir - * aligned at the offset of the dd_dir.d_type field - */ - struct _finddata_t dd_dta; - - /* _findnext handle */ - intptr_t dd_handle; - - /* Status of search: - * (type is now int -- was short in older versions). - * 0 = not started yet (next entry to read is first entry) - * -1 = off the end - * positive = 0 based index of next entry - */ - int dd_stat; - - /* given path for dir with search pattern (struct is extended) */ - char dd_name[1]; - - } dd_private; -}; - -union __wdirstream_t -{ - /* Actual (private) declaration for opaque data type "_WDIR". */ - - /* dirent struct to return from dir (NOTE: this makes this thread - * safe as long as only one thread uses a particular DIR struct at - * a time) */ - struct _wdirent dd_dir; - - struct __wdirstream_private_t - { - /* Three padding fields, matching the head of dd_dir... - */ - long dd_ino; /* Always zero. */ - unsigned short dd_reclen; /* Always zero. */ - unsigned short dd_namlen; /* Length of name in d_name. */ - - /* ...to keep the start of this disk transfer area for this dir - * aligned at the offset of the dd_dir.d_type field - */ - struct _wfinddata_t dd_dta; - - /* _findnext handle */ - intptr_t dd_handle; - - /* Status of search: - * 0 = not started yet (next entry to read is first entry) - * -1 = off the end - * positive = 0 based index of next entry - */ - int dd_stat; - - /* given path for dir with search pattern (struct is extended) */ - wchar_t dd_name[1]; - - } dd_private; -}; - -/* We map the BSD d_type field in the returned dirent structure - * from the Microsoft _finddata_t dd_dta.attrib bits, which are: - * - * _A_NORMAL (0x0000) normal file: best fit for DT_REG - * _A_RDONLY (0x0001) read-only: no BSD d_type equivalent - * _A_HIDDEN (0x0002) hidden entity: no BSD equivalent - * _A_SYSTEM (0x0004) system entity: no BSD equivalent - * _A_VOLID (0x0008) volume label: no BSD equivalent - * _A_SUBDIR (0x0010) directory: best fit for DT_DIR - * _A_ARCH (0x0020) "dirty": no BSD equivalent - * - * Of these, _A_RDONLY, _A_HIDDEN, _A_SYSTEM, and _A_ARCH are - * modifier bits, rather than true entity type specifiers; we - * will ignore them in the mapping, by applying this mask: - */ -#define DT_IGNORED (_A_RDONLY | _A_HIDDEN | _A_SYSTEM | _A_ARCH) - -#define DIRENT_OPEN(D) \ - ((D).dd_handle = _tfindfirst((D).dd_name, &((D).dd_dta))) - -#define DIRENT_UPDATE(D) \ - _tfindnext( (D).dd_handle, &(D).dd_dta ) - - -/***** - * - * opendir() - * - * Returns a pointer to a DIR structure appropriately filled in - * to begin searching a directory. - * - */ -_TDIR * -_topendir( const _TCHAR *path_name ) -{ - _TDIR *nd; - _TCHAR abs_path[MAX_PATH]; - - /* Reject any request which passes a NULL or an empty path name; - * note that POSIX doesn't specify the handling for the NULL case, - * and some implementations may simply fail with a segmentation - * fault. We will fail more gracefully. Previous versions used - * EFAULT here, but EINVAL seems more appropriate; however, POSIX - * specifies neither of these for any opendir() failure. - */ - DIRENT_REJECT( (path_name == NULL), EINVAL, (_TDIR *)(NULL) ); - /* - * Conversely, POSIX *does* specify ENOENT for the empty path - * name case, where we previously had ENOTDIR; here, we correct - * this previous anomaly. - */ - DIRENT_REJECT( (*path_name == _T('\0')), ENOENT, (_TDIR *)(NULL) ); - - /* Identify the absolute path name corresponding to the (maybe - * relative) path name we are to process; (this ensures that we - * may always refer back to this same path name, e.g. to rewind - * the "directory stream", even after an intervening change of - * current working directory). - */ - _tfullpath( abs_path, path_name, MAX_PATH ); - - /* Ensure that the generated absolute path name ends with a - * directory separator (backslash) character, so that we may - * correctly append a wild-card matching pattern which will - * cause _findfirst() and _findnext() to return every entry - * in the specified directory; (note that, for now we may - * simply assume that abs_path refers to a directory; - * we will verify that when we call _findfirst() on it). - */ - if( *abs_path != _T('\0') ) - { - size_t offset = _tcslen( abs_path ) - 1; - if( (abs_path[offset] != _T('/')) && (abs_path[offset] != _T('\\')) ) - _tcscat( abs_path, _T("\\") ); - } - - /* Now append the "match everything" wild-card pattern. - */ - _tcscat( abs_path, _T("*") ); - - /* Allocate space to store DIR structure. The size MUST be - * adjusted to accommodate the complete absolute path name for - * the specified directory, extended to include the wild-card - * matching pattern, as above; (note that we DO NOT need any - * special provision for the terminating NUL on the path name, - * since the base size of the DIR structure includes it). - */ - nd = (_TDIR *)(malloc( - sizeof( _TDIR ) + (_tcslen( abs_path ) * sizeof( _TCHAR )) - )); - - /* Bail out, if insufficient memory. - */ - DIRENT_REJECT( (nd == NULL), ENOMEM, (_TDIR *)(NULL) ); - - /* Copy the extended absolute path name string into place - * within the allocated space for the DIR structure. - */ - _tcscpy( nd->dd_private.dd_name, abs_path ); - - /* Initialize the "directory stream", by calling _findfirst() on it; - * this leaves the data for the first directory entry in the internal - * dirent buffer, ready to be retrieved by readdir(). - */ - if( DIRENT_OPEN( nd->dd_private ) == (intptr_t)(-1) ) - { - /* The _findfirst() call, (implied by DIRENT_OPEN), failed; - * _findfirst() sets EINVAL where POSIX mandates ENOTDIR... - */ - if( errno == EINVAL ) - errno = ENOTDIR; - - /* ...otherwise, while it may not be strictly POSIX conformant, - * just accept whatever value _findfirst() assigned to errno. In - * any event, prepare to return the NULL "directory stream"; since - * this implies that we will lose our reference pointer to the - * block of memory we allocated for the stream, free that - * before we bail out. - */ - free( nd ); - return (_TDIR *)(NULL); - } - - /* Initialize the status, (i.e. the location index), so that - * readdir() will simply return the first directory entry, which - * has already been fetched by _findfirst(), without performing - * an intervening _findnext() call. - */ - nd->dd_private.dd_stat = 0; - - /* The d_ino and d_reclen fields have no relevance in MS-Windows; - * initialize them to zero, as a one-time assignment for this DIR - * instance, and henceforth forget them; (users should simply - * ignore them). - */ - nd->dd_dir.d_ino = 0; - nd->dd_dir.d_reclen = 0; - - /* We've now completely initialized an instance of a DIR structure, - * representing the requested "directory stream"; return a pointer - * via which the caller may access it. - */ - return nd; -} - - -/***** - * - * readdir() - * - * Return a pointer to a dirent structure filled in with information - * on the next available entry, (if any), in the "directory stream". - */ -struct _tdirent * -_treaddir( _TDIR *dirp ) -{ - /* Check for a valid DIR stream reference; (we can't really - * be certain until we try to read from it, except in the case - * of a NULL pointer reference). Where we lack a valid reference, - * POSIX mandates reporting EBADF; we previously had EFAULT, so - * this version corrects the former anomaly. - */ - DIRENT_REJECT( (dirp == NULL), EBADF, (struct _tdirent *)(NULL) ); - - /* Okay to proceed. If this is the first readdir() request - * following an opendir(), or a rewinddir(), then we already - * have the requisite return information... - */ - if( dirp->dd_private.dd_stat++ > 0 ) - { - /* Otherwise... - * - * Get the next search entry. POSIX mandates that this must - * return NULL after the last entry has been read, but that it - * MUST NOT change errno in this case. MS-Windows _findnext() - * DOES change errno (to ENOENT) after the last entry has been - * read, so we must be prepared to restore it to its previous - * value, when no actual error has occurred. - */ - int prev_errno = errno; - if( DIRENT_UPDATE( dirp->dd_private ) != 0 ) - { - /* May be an error, or just the case described above... - */ - if( GetLastError() == ERROR_NO_MORE_FILES ) - /* - * ...which requires us to reset errno. - */ - errno = prev_errno; - - /* In either case, there is no valid data to return. - */ - return (struct _tdirent *)(NULL); - } - } - - /* Successfully got an entry. Everything about the file is - * already appropriately filled in, except for the length of - * the file name in the d_namlen field... - */ - dirp->dd_dir.d_namlen = _tcslen( dirp->dd_dir.d_name ); - /* - * ...and the attributes returned in the dd_dta.attrib field; - * these require adjustment to their BSD equivalents, which are - * returned via the union with the dd_dir.d_type field: - */ - switch( dirp->dd_dir.d_type &= ~DT_IGNORED ) - { - case DT_REG: - case DT_DIR: - /* After stripping out the modifier bits in DT_IGNORED, - * (which we ALWAYS ignore), this pair require no further - * adjustment... - */ - break; - - default: - /* ...while nothing else has an appropriate equivalent - * in the BSD d_type identification model. - */ - dirp->dd_dir.d_type = DT_UNKNOWN; - } - return &dirp->dd_dir; -} - - -/***** - * - * closedir() - * - * Frees up resources allocated by opendir(). - * - */ -int -_tclosedir( _TDIR * dirp ) -{ - /* Attempting to reference a directory stream via a NULL pointer - * would cause a segmentation fault; evade this. Since NULL can - * never represent an open directory stream, set the EBADF errno - * status, as mandated by POSIX, once again correcting previous - * anomalous use of EFAULT in this context. - */ - DIRENT_REJECT( - ((dirp == NULL) || (_findclose( dirp->dd_private.dd_handle ) != 0)), - EBADF, -1 - ); - - /* If we didn't bail out above, we have a valid DIR structure - * with which we have finished; release the memory allocated - * to it, before returning "success". - */ - free( dirp ); - return 0; -} - - -/***** - * - * rewinddir() - * - * Return to the beginning of the directory "stream". We simply call - * _findclose(), to clear prior context, then _findfirst() to restart - * the directory search, resetting the location index appropriately, - * as it would be left by opendir(). - * - */ -void -_trewinddir( _TDIR * dirp ) -{ - /* This is an XSI extension to POSIX, which specifies no formal - * error conditions; we will continue to check for and evade the - * potential segmentation fault which would result from passing a - * NULL reference pointer. For consistency with the core functions - * implemented above, we will again report this as EBADF, rather - * than the EFAULT of previous versions. - */ - DIRENT_REJECT( - ((dirp == NULL) || (_findclose( dirp->dd_private.dd_handle ) != 0)), - EBADF, DIRENT_RETURN_NOTHING - ); - - /* We successfully closed the prior search context; reopen... - */ - if( DIRENT_OPEN( dirp->dd_private ) != (intptr_t)(-1) ) - /* - * ...and, on success, reset the location index. - */ - dirp->dd_private.dd_stat = 0; -} - - -/***** - * - * telldir() - * - * Returns the "position" in the "directory stream" which can then - * be passed to seekdir(), to return back to a previous entry. We - * simply return the current location index from the dd_stat field. - * - */ -long -_ttelldir( _TDIR * dirp ) -{ - /* This too is a POSIX-XSI extension, with no mandatory error - * conditions. Once again, evade a potential segmentation fault - * on passing a NULL reference pointer, again reporting it as - * EBADF in preference to the EFAULT of previous versions. - */ - DIRENT_REJECT( (dirp == NULL), EBADF, -1 ); - - /* We didn't bail out; just assume dirp is valid, and return - * the location index from the dd_stat field. - */ - return dirp->dd_private.dd_stat; -} - - -/***** - * - * seekdir() - * - * Seek to an entry previously returned by telldir(). We rewind - * the "directory stream", then repeatedly call _findnext() while - * incrementing its internal location index until it matches the - * position requested, or we reach the end of the stream. This is - * not perfect, in that the directory may have changed while we - * weren't looking, but it is the best we can achieve, and may - * likely reproduce the behaviour of other implementations. - * - */ -void -_tseekdir( _TDIR * dirp, long loc ) -{ - /* Another POSIX-XSI extension, with no specified mandatory - * error conditions; we require a seek location of zero or - * greater, and will reject less than zero as EINVAL... - */ - DIRENT_REJECT( (loc < 0L), EINVAL, DIRENT_RETURN_NOTHING ); - - /* Other than this, we simply accept any error condition - * which arises as we "rewind" the "directory stream"... - */ - _trewinddir( dirp ); - - /* ...and, if this is successful... - */ - if( (loc > 0) && (dirp->dd_private.dd_handle != (intptr_t)(-1)) ) - /* - * ...seek forward until the location index within - * the DIR structure matches the requested location. - */ - while( (++dirp->dd_private.dd_stat < loc) - && (DIRENT_UPDATE( dirp->dd_private ) == 0) ) - ; -} - -/* $RCSfile: dirent.c,v $: end of file */ diff --git a/direntx.h b/direntx.h index 3abedfaf..e7f8aaa4 100644 --- a/direntx.h +++ b/direntx.h @@ -1,143 +1,1159 @@ /* - * DIRENT.H (formerly DIRLIB.H) - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. + * Dirent interface for Microsoft Visual Studio * + * Copyright (C) 2006-2012 Toni Ronkko + * This file is part of dirent. Dirent may be freely distributed + * under the MIT license. For all details and documentation, see + * https://github.com/tronkko/dirent */ -#ifndef _DIRENT_H_ -#define _DIRENT_H_ +#ifndef DIRENT_H +#define DIRENT_H -/* All the headers include this file. */ -#include <_mingw.h> +/* + * Include windows.h without Windows Sockets 1.1 to prevent conflicts with + * Windows Sockets 2.0. + */ +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif +#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Indicates that d_type field is available in dirent structure */ +#define _DIRENT_HAVE_D_TYPE + +/* Indicates that d_namlen field is available in dirent structure */ +#define _DIRENT_HAVE_D_NAMLEN + +/* Entries missing from MSVC 6.0 */ +#if !defined(FILE_ATTRIBUTE_DEVICE) +# define FILE_ATTRIBUTE_DEVICE 0x40 +#endif + +/* File type and permission flags for stat(), general mask */ +#if !defined(S_IFMT) +# define S_IFMT _S_IFMT +#endif + +/* Directory bit */ +#if !defined(S_IFDIR) +# define S_IFDIR _S_IFDIR +#endif + +/* Character device bit */ +#if !defined(S_IFCHR) +# define S_IFCHR _S_IFCHR +#endif + +/* Pipe bit */ +#if !defined(S_IFFIFO) +# define S_IFFIFO _S_IFFIFO +#endif + +/* Regular file bit */ +#if !defined(S_IFREG) +# define S_IFREG _S_IFREG +#endif + +/* Read permission */ +#if !defined(S_IREAD) +# define S_IREAD _S_IREAD +#endif + +/* Write permission */ +#if !defined(S_IWRITE) +# define S_IWRITE _S_IWRITE +#endif + +/* Execute permission */ +#if !defined(S_IEXEC) +# define S_IEXEC _S_IEXEC +#endif + +/* Pipe */ +#if !defined(S_IFIFO) +# define S_IFIFO _S_IFIFO +#endif + +/* Block device */ +#if !defined(S_IFBLK) +# define S_IFBLK 0 +#endif + +/* Link */ +#if !defined(S_IFLNK) +# define S_IFLNK 0 +#endif + +/* Socket */ +#if !defined(S_IFSOCK) +# define S_IFSOCK 0 +#endif + +/* Read user permission */ +#if !defined(S_IRUSR) +# define S_IRUSR S_IREAD +#endif + +/* Write user permission */ +#if !defined(S_IWUSR) +# define S_IWUSR S_IWRITE +#endif + +/* Execute user permission */ +#if !defined(S_IXUSR) +# define S_IXUSR 0 +#endif + +/* Read group permission */ +#if !defined(S_IRGRP) +# define S_IRGRP 0 +#endif + +/* Write group permission */ +#if !defined(S_IWGRP) +# define S_IWGRP 0 +#endif + +/* Execute group permission */ +#if !defined(S_IXGRP) +# define S_IXGRP 0 +#endif + +/* Read others permission */ +#if !defined(S_IROTH) +# define S_IROTH 0 +#endif + +/* Write others permission */ +#if !defined(S_IWOTH) +# define S_IWOTH 0 +#endif + +/* Execute others permission */ +#if !defined(S_IXOTH) +# define S_IXOTH 0 +#endif + +/* Maximum length of file name */ +#if !defined(PATH_MAX) +# define PATH_MAX MAX_PATH +#endif +#if !defined(FILENAME_MAX) +# define FILENAME_MAX MAX_PATH +#endif +#if !defined(NAME_MAX) +# define NAME_MAX FILENAME_MAX +#endif + +/* File type flags for d_type */ +#define DT_UNKNOWN 0 +#define DT_REG S_IFREG +#define DT_DIR S_IFDIR +#define DT_FIFO S_IFIFO +#define DT_SOCK S_IFSOCK +#define DT_CHR S_IFCHR +#define DT_BLK S_IFBLK +#define DT_LNK S_IFLNK + +/* Macros for converting between st_mode and d_type */ +#define IFTODT(mode) ((mode) & S_IFMT) +#define DTTOIF(type) (type) + +/* + * File type macros. Note that block devices, sockets and links cannot be + * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are + * only defined for compatibility. These macros should always return false + * on Windows. + */ +#if !defined(S_ISFIFO) +# define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO) +#endif +#if !defined(S_ISDIR) +# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) +#endif +#if !defined(S_ISREG) +# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) +#endif +#if !defined(S_ISLNK) +# define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) +#endif +#if !defined(S_ISSOCK) +# define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK) +#endif +#if !defined(S_ISCHR) +# define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR) +#endif +#if !defined(S_ISBLK) +# define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK) +#endif + +/* Return the exact length of the file name without zero terminator */ +#define _D_EXACT_NAMLEN(p) ((p)->d_namlen) + +/* Return the maximum size of a file name */ +#define _D_ALLOC_NAMLEN(p) ((PATH_MAX)+1) -#ifndef RC_INVOKED #ifdef __cplusplus extern "C" { #endif -struct dirent -{ - long d_ino; /* Always zero. */ - unsigned short d_reclen; /* Always zero. */ - unsigned short d_namlen; /* Length of name in d_name. */ - /* The following exactly mimic the layout of _finddata_t ... - */ - unsigned d_type; /* File attributes */ - time_t d_time_create; - time_t d_time_access; /* always midnight local time */ - time_t d_time_write; - _fsize_t d_size; - /* - * ...so that we may map a union of _finddata_t at the - * location of d_type (corresponding to _finddata_t.attrib), - * and thus map this directly to the _findfirst/_findnext - * returned field. - */ - char d_name[FILENAME_MAX]; /* File name. */ +/* Wide-character version */ +struct _wdirent { + /* Always zero */ + long d_ino; + + /* File position within stream */ + long d_off; + + /* Structure size */ + unsigned short d_reclen; + + /* Length of name without \0 */ + size_t d_namlen; + + /* File type */ + int d_type; + + /* File name */ + wchar_t d_name[PATH_MAX+1]; }; +typedef struct _wdirent _wdirent; + +struct _WDIR { + /* Current directory entry */ + struct _wdirent ent; + + /* Private file data */ + WIN32_FIND_DATAW data; + + /* True if data is valid */ + int cached; + + /* Win32 search handle */ + HANDLE handle; + + /* Initial directory name */ + wchar_t *patt; +}; +typedef struct _WDIR _WDIR; + +/* Multi-byte character version */ +struct dirent { + /* Always zero */ + long d_ino; + + /* File position within stream */ + long d_off; + + /* Structure size */ + unsigned short d_reclen; + + /* Length of name without \0 */ + size_t d_namlen; + + /* File type */ + int d_type; + + /* File name */ + char d_name[PATH_MAX+1]; +}; +typedef struct dirent dirent; + +struct DIR { + struct dirent ent; + struct _WDIR *wdirp; +}; +typedef struct DIR DIR; + + +/* Dirent functions */ +static DIR *opendir (const char *dirname); +static _WDIR *_wopendir (const wchar_t *dirname); + +static struct dirent *readdir (DIR *dirp); +static struct _wdirent *_wreaddir (_WDIR *dirp); + +static int readdir_r( + DIR *dirp, struct dirent *entry, struct dirent **result); +static int _wreaddir_r( + _WDIR *dirp, struct _wdirent *entry, struct _wdirent **result); + +static int closedir (DIR *dirp); +static int _wclosedir (_WDIR *dirp); + +static void rewinddir (DIR* dirp); +static void _wrewinddir (_WDIR* dirp); + +static int scandir (const char *dirname, struct dirent ***namelist, + int (*filter)(const struct dirent*), + int (*compare)(const struct dirent**, const struct dirent**)); + +static int alphasort (const struct dirent **a, const struct dirent **b); + +static int versionsort (const struct dirent **a, const struct dirent **b); + + +/* For compatibility with Symbian */ +#define wdirent _wdirent +#define WDIR _WDIR +#define wopendir _wopendir +#define wreaddir _wreaddir +#define wclosedir _wclosedir +#define wrewinddir _wrewinddir + + +/* Internal utility functions */ +static WIN32_FIND_DATAW *dirent_first (_WDIR *dirp); +static WIN32_FIND_DATAW *dirent_next (_WDIR *dirp); + +static int dirent_mbstowcs_s( + size_t *pReturnValue, + wchar_t *wcstr, + size_t sizeInWords, + const char *mbstr, + size_t count); + +static int dirent_wcstombs_s( + size_t *pReturnValue, + char *mbstr, + size_t sizeInBytes, + const wchar_t *wcstr, + size_t count); + +static void dirent_set_errno (int error); + /* - * This opaque data type represents the private structure - * through which a directory stream is referenced. + * Open directory stream DIRNAME for read and return a pointer to the + * internal working area that is used to retrieve individual directory + * entries. */ -typedef union __dirstream_t DIR; - -DIR* __cdecl __MINGW_NOTHROW opendir (const char*); -struct dirent* __cdecl __MINGW_NOTHROW readdir (DIR*); -int __cdecl __MINGW_NOTHROW closedir (DIR*); -void __cdecl __MINGW_NOTHROW rewinddir (DIR*); -long __cdecl __MINGW_NOTHROW telldir (DIR*); -void __cdecl __MINGW_NOTHROW seekdir (DIR*, long); - - -/* wide char versions */ - -struct _wdirent +static _WDIR* +_wopendir( + const wchar_t *dirname) { - long d_ino; /* Always zero. */ - unsigned short d_reclen; /* Always zero. */ - unsigned short d_namlen; /* Length of name in d_name. */ + _WDIR *dirp = NULL; + int error; - /* The following exactly mimic the layout of _wfinddata_t ... - */ - unsigned d_type; /* File attributes */ - time_t d_time_create; /* -1 for FAT file systems */ - time_t d_time_access; /* -1 for FAT file systems */ - time_t d_time_write; - _fsize_t d_size; - /* - * ...so that we may map a union of _wfinddata_t at the - * location of d_type (corresponding to _wfinddata_t.attrib), - * and thus map this directly to the _wfindfirst/_wfindnext - * returned field. - */ - wchar_t d_name[FILENAME_MAX]; /* File name. */ -}; + /* Must have directory name */ + if (dirname == NULL || dirname[0] == '\0') { + dirent_set_errno (ENOENT); + return NULL; + } -/* - * This opaque data type represents the private structure - * through which a wide directory stream is referenced. - */ -typedef union __wdirstream_t _WDIR; + /* Allocate new _WDIR structure */ + dirp = (_WDIR*) malloc (sizeof (struct _WDIR)); + if (dirp != NULL) { + DWORD n; -_WDIR* __cdecl __MINGW_NOTHROW _wopendir (const wchar_t*); -struct _wdirent* __cdecl __MINGW_NOTHROW _wreaddir (_WDIR*); -int __cdecl __MINGW_NOTHROW _wclosedir (_WDIR*); -void __cdecl __MINGW_NOTHROW _wrewinddir (_WDIR*); -long __cdecl __MINGW_NOTHROW _wtelldir (_WDIR*); -void __cdecl __MINGW_NOTHROW _wseekdir (_WDIR*, long); + /* Reset _WDIR structure */ + dirp->handle = INVALID_HANDLE_VALUE; + dirp->patt = NULL; + dirp->cached = 0; + /* Compute the length of full path plus zero terminator + * + * Note that on WinRT there's no way to convert relative paths + * into absolute paths, so just assume it is an absolute path. + */ +# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) + n = wcslen(dirname); +# else + n = GetFullPathNameW (dirname, 0, NULL, NULL); +# endif -#ifdef __cplusplus + /* Allocate room for absolute directory name and search pattern */ + dirp->patt = (wchar_t*) malloc (sizeof (wchar_t) * n + 16); + if (dirp->patt) { + + /* + * Convert relative directory name to an absolute one. This + * allows rewinddir() to function correctly even when current + * working directory is changed between opendir() and rewinddir(). + * + * Note that on WinRT there's no way to convert relative paths + * into absolute paths, so just assume it is an absolute path. + */ +# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) + wcsncpy_s(dirp->patt, n+1, dirname, n); +# else + n = GetFullPathNameW (dirname, n, dirp->patt, NULL); +# endif + if (n > 0) { + wchar_t *p; + + /* Append search pattern \* to the directory name */ + p = dirp->patt + n; + if (dirp->patt < p) { + switch (p[-1]) { + case '\\': + case '/': + case ':': + /* Directory ends in path separator, e.g. c:\temp\ */ + /*NOP*/; + break; + + default: + /* Directory name doesn't end in path separator */ + *p++ = '\\'; + } + } + *p++ = '*'; + *p = '\0'; + + /* Open directory stream and retrieve the first entry */ + if (dirent_first (dirp)) { + /* Directory stream opened successfully */ + error = 0; + } else { + /* Cannot retrieve first entry */ + error = 1; + dirent_set_errno (ENOENT); + } + + } else { + /* Cannot retrieve full path name */ + dirent_set_errno (ENOENT); + error = 1; + } + + } else { + /* Cannot allocate memory for search pattern */ + error = 1; + } + + } else { + /* Cannot allocate _WDIR structure */ + error = 1; + } + + /* Clean up in case of error */ + if (error && dirp) { + _wclosedir (dirp); + dirp = NULL; + } + + return dirp; } + +/* + * Read next directory entry. + * + * Returns pointer to static directory entry which may be overwritten by + * subsequent calls to _wreaddir(). + */ +static struct _wdirent* +_wreaddir( + _WDIR *dirp) +{ + struct _wdirent *entry; + + /* + * Read directory entry to buffer. We can safely ignore the return value + * as entry will be set to NULL in case of error. + */ + (void) _wreaddir_r (dirp, &dirp->ent, &entry); + + /* Return pointer to statically allocated directory entry */ + return entry; +} + +/* + * Read next directory entry. + * + * Returns zero on success. If end of directory stream is reached, then sets + * result to NULL and returns zero. + */ +static int +_wreaddir_r( + _WDIR *dirp, + struct _wdirent *entry, + struct _wdirent **result) +{ + WIN32_FIND_DATAW *datap; + + /* Read next directory entry */ + datap = dirent_next (dirp); + if (datap) { + size_t n; + DWORD attr; + + /* + * Copy file name as wide-character string. If the file name is too + * long to fit in to the destination buffer, then truncate file name + * to PATH_MAX characters and zero-terminate the buffer. + */ + n = 0; + while (n < PATH_MAX && datap->cFileName[n] != 0) { + entry->d_name[n] = datap->cFileName[n]; + n++; + } + entry->d_name[n] = 0; + + /* Length of file name excluding zero terminator */ + entry->d_namlen = n; + + /* File type */ + attr = datap->dwFileAttributes; + if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) { + entry->d_type = DT_CHR; + } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) { + entry->d_type = DT_DIR; + } else { + entry->d_type = DT_REG; + } + + /* Reset dummy fields */ + entry->d_ino = 0; + entry->d_off = 0; + entry->d_reclen = sizeof (struct _wdirent); + + /* Set result address */ + *result = entry; + + } else { + + /* Return NULL to indicate end of directory */ + *result = NULL; + + } + + return /*OK*/0; +} + +/* + * Close directory stream opened by opendir() function. This invalidates the + * DIR structure as well as any directory entry read previously by + * _wreaddir(). + */ +static int +_wclosedir( + _WDIR *dirp) +{ + int ok; + if (dirp) { + + /* Release search handle */ + if (dirp->handle != INVALID_HANDLE_VALUE) { + FindClose (dirp->handle); + dirp->handle = INVALID_HANDLE_VALUE; + } + + /* Release search pattern */ + if (dirp->patt) { + free (dirp->patt); + dirp->patt = NULL; + } + + /* Release directory structure */ + free (dirp); + ok = /*success*/0; + + } else { + + /* Invalid directory stream */ + dirent_set_errno (EBADF); + ok = /*failure*/-1; + + } + return ok; +} + +/* + * Rewind directory stream such that _wreaddir() returns the very first + * file name again. + */ +static void +_wrewinddir( + _WDIR* dirp) +{ + if (dirp) { + /* Release existing search handle */ + if (dirp->handle != INVALID_HANDLE_VALUE) { + FindClose (dirp->handle); + } + + /* Open new search handle */ + dirent_first (dirp); + } +} + +/* Get first directory entry (internal) */ +static WIN32_FIND_DATAW* +dirent_first( + _WDIR *dirp) +{ + WIN32_FIND_DATAW *datap; + + /* Open directory and retrieve the first entry */ + dirp->handle = FindFirstFileExW( + dirp->patt, FindExInfoStandard, &dirp->data, + FindExSearchNameMatch, NULL, 0); + if (dirp->handle != INVALID_HANDLE_VALUE) { + + /* a directory entry is now waiting in memory */ + datap = &dirp->data; + dirp->cached = 1; + + } else { + + /* Failed to re-open directory: no directory entry in memory */ + dirp->cached = 0; + datap = NULL; + + } + return datap; +} + +/* + * Get next directory entry (internal). + * + * Returns + */ +static WIN32_FIND_DATAW* +dirent_next( + _WDIR *dirp) +{ + WIN32_FIND_DATAW *p; + + /* Get next directory entry */ + if (dirp->cached != 0) { + + /* A valid directory entry already in memory */ + p = &dirp->data; + dirp->cached = 0; + + } else if (dirp->handle != INVALID_HANDLE_VALUE) { + + /* Get the next directory entry from stream */ + if (FindNextFileW (dirp->handle, &dirp->data) != FALSE) { + /* Got a file */ + p = &dirp->data; + } else { + /* The very last entry has been processed or an error occurred */ + FindClose (dirp->handle); + dirp->handle = INVALID_HANDLE_VALUE; + p = NULL; + } + + } else { + + /* End of directory stream reached */ + p = NULL; + + } + + return p; +} + +/* + * Open directory stream using plain old C-string. + */ +static DIR* +opendir( + const char *dirname) +{ + struct DIR *dirp; + int error; + + /* Must have directory name */ + if (dirname == NULL || dirname[0] == '\0') { + dirent_set_errno (ENOENT); + return NULL; + } + + /* Allocate memory for DIR structure */ + dirp = (DIR*) malloc (sizeof (struct DIR)); + if (dirp) { + wchar_t wname[PATH_MAX + 1]; + size_t n; + + /* Convert directory name to wide-character string */ + error = dirent_mbstowcs_s( + &n, wname, PATH_MAX + 1, dirname, PATH_MAX + 1); + if (!error) { + + /* Open directory stream using wide-character name */ + dirp->wdirp = _wopendir (wname); + if (dirp->wdirp) { + /* Directory stream opened */ + error = 0; + } else { + /* Failed to open directory stream */ + error = 1; + } + + } else { + /* + * Cannot convert file name to wide-character string. This + * occurs if the string contains invalid multi-byte sequences or + * the output buffer is too small to contain the resulting + * string. + */ + error = 1; + } + + } else { + /* Cannot allocate DIR structure */ + error = 1; + } + + /* Clean up in case of error */ + if (error && dirp) { + free (dirp); + dirp = NULL; + } + + return dirp; +} + +/* + * Read next directory entry. + */ +static struct dirent* +readdir( + DIR *dirp) +{ + struct dirent *entry; + + /* + * Read directory entry to buffer. We can safely ignore the return value + * as entry will be set to NULL in case of error. + */ + (void) readdir_r (dirp, &dirp->ent, &entry); + + /* Return pointer to statically allocated directory entry */ + return entry; +} + +/* + * Read next directory entry into called-allocated buffer. + * + * Returns zero on success. If the end of directory stream is reached, then + * sets result to NULL and returns zero. + */ +static int +readdir_r( + DIR *dirp, + struct dirent *entry, + struct dirent **result) +{ + WIN32_FIND_DATAW *datap; + + /* Read next directory entry */ + datap = dirent_next (dirp->wdirp); + if (datap) { + size_t n; + int error; + + /* Attempt to convert file name to multi-byte string */ + error = dirent_wcstombs_s( + &n, entry->d_name, PATH_MAX + 1, datap->cFileName, PATH_MAX + 1); + + /* + * If the file name cannot be represented by a multi-byte string, + * then attempt to use old 8+3 file name. This allows traditional + * Unix-code to access some file names despite of unicode + * characters, although file names may seem unfamiliar to the user. + * + * Be ware that the code below cannot come up with a short file + * name unless the file system provides one. At least + * VirtualBox shared folders fail to do this. + */ + if (error && datap->cAlternateFileName[0] != '\0') { + error = dirent_wcstombs_s( + &n, entry->d_name, PATH_MAX + 1, + datap->cAlternateFileName, PATH_MAX + 1); + } + + if (!error) { + DWORD attr; + + /* Length of file name excluding zero terminator */ + entry->d_namlen = n - 1; + + /* File attributes */ + attr = datap->dwFileAttributes; + if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) { + entry->d_type = DT_CHR; + } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) { + entry->d_type = DT_DIR; + } else { + entry->d_type = DT_REG; + } + + /* Reset dummy fields */ + entry->d_ino = 0; + entry->d_off = 0; + entry->d_reclen = sizeof (struct dirent); + + } else { + + /* + * Cannot convert file name to multi-byte string so construct + * an erroneous directory entry and return that. Note that + * we cannot return NULL as that would stop the processing + * of directory entries completely. + */ + entry->d_name[0] = '?'; + entry->d_name[1] = '\0'; + entry->d_namlen = 1; + entry->d_type = DT_UNKNOWN; + entry->d_ino = 0; + entry->d_off = -1; + entry->d_reclen = 0; + + } + + /* Return pointer to directory entry */ + *result = entry; + + } else { + + /* No more directory entries */ + *result = NULL; + + } + + return /*OK*/0; +} + +/* + * Close directory stream. + */ +static int +closedir( + DIR *dirp) +{ + int ok; + if (dirp) { + + /* Close wide-character directory stream */ + ok = _wclosedir (dirp->wdirp); + dirp->wdirp = NULL; + + /* Release multi-byte character version */ + free (dirp); + + } else { + + /* Invalid directory stream */ + dirent_set_errno (EBADF); + ok = /*failure*/-1; + + } + return ok; +} + +/* + * Rewind directory stream to beginning. + */ +static void +rewinddir( + DIR* dirp) +{ + /* Rewind wide-character string directory stream */ + _wrewinddir (dirp->wdirp); +} + +/* + * Scan directory for entries. + */ +static int +scandir( + const char *dirname, + struct dirent ***namelist, + int (*filter)(const struct dirent*), + int (*compare)(const struct dirent**, const struct dirent**)) +{ + struct dirent **files = NULL; + size_t size = 0; + size_t allocated = 0; + const size_t init_size = 1; + DIR *dir = NULL; + struct dirent *entry; + struct dirent *tmp = NULL; + size_t i; + int result = 0; + + /* Open directory stream */ + dir = opendir (dirname); + if (dir) { + + /* Read directory entries to memory */ + while (1) { + + /* Enlarge pointer table to make room for another pointer */ + if (size >= allocated) { + void *p; + size_t num_entries; + + /* Compute number of entries in the enlarged pointer table */ + if (size < init_size) { + /* Allocate initial pointer table */ + num_entries = init_size; + } else { + /* Double the size */ + num_entries = size * 2; + } + + /* Allocate first pointer table or enlarge existing table */ + p = realloc (files, sizeof (void*) * num_entries); + if (p != NULL) { + /* Got the memory */ + files = (dirent**) p; + allocated = num_entries; + } else { + /* Out of memory */ + result = -1; + break; + } + + } + + /* Allocate room for temporary directory entry */ + if (tmp == NULL) { + tmp = (struct dirent*) malloc (sizeof (struct dirent)); + if (tmp == NULL) { + /* Cannot allocate temporary directory entry */ + result = -1; + break; + } + } + + /* Read directory entry to temporary area */ + if (readdir_r (dir, tmp, &entry) == /*OK*/0) { + + /* Did we get an entry? */ + if (entry != NULL) { + int pass; + + /* Determine whether to include the entry in result */ + if (filter) { + /* Let the filter function decide */ + pass = filter (tmp); + } else { + /* No filter function, include everything */ + pass = 1; + } + + if (pass) { + /* Store the temporary entry to pointer table */ + files[size++] = tmp; + tmp = NULL; + + /* Keep up with the number of files */ + result++; + } + + } else { + + /* + * End of directory stream reached => sort entries and + * exit. + */ + qsort (files, size, sizeof (void*), + (int (*) (const void*, const void*)) compare); + break; + + } + + } else { + /* Error reading directory entry */ + result = /*Error*/ -1; + break; + } + + } + + } else { + /* Cannot open directory */ + result = /*Error*/ -1; + } + + /* Release temporary directory entry */ + if (tmp) { + free (tmp); + } + + /* Release allocated memory on error */ + if (result < 0) { + for (i = 0; i < size; i++) { + free (files[i]); + } + free (files); + files = NULL; + } + + /* Close directory stream */ + if (dir) { + closedir (dir); + } + + /* Pass pointer table to caller */ + if (namelist) { + *namelist = files; + } + return result; +} + +/* Alphabetical sorting */ +static int +alphasort( + const struct dirent **a, const struct dirent **b) +{ + return strcoll ((*a)->d_name, (*b)->d_name); +} + +/* Sort versions */ +static int +versionsort( + const struct dirent **a, const struct dirent **b) +{ + /* FIXME: implement strverscmp and use that */ + return alphasort (a, b); +} + + +/* Convert multi-byte string to wide character string */ +static int +dirent_mbstowcs_s( + size_t *pReturnValue, + wchar_t *wcstr, + size_t sizeInWords, + const char *mbstr, + size_t count) +{ + int error; + +#if defined(_MSC_VER) && _MSC_VER >= 1400 + + /* Microsoft Visual Studio 2005 or later */ + error = mbstowcs_s (pReturnValue, wcstr, sizeInWords, mbstr, count); + +#else + + /* Older Visual Studio or non-Microsoft compiler */ + size_t n; + + /* Convert to wide-character string (or count characters) */ + n = mbstowcs (wcstr, mbstr, sizeInWords); + if (!wcstr || n < count) { + + /* Zero-terminate output buffer */ + if (wcstr && sizeInWords) { + if (n >= sizeInWords) { + n = sizeInWords - 1; + } + wcstr[n] = 0; + } + + /* Length of resulting multi-byte string WITH zero terminator */ + if (pReturnValue) { + *pReturnValue = n + 1; + } + + /* Success */ + error = 0; + + } else { + + /* Could not convert string */ + error = 1; + + } + #endif -#if defined(_BSD_SOURCE) || defined(_WIN32) -/* - * BSD-ish systems define manifest constants for the d_type field; - * although probably only DT_REG and DT_DIR are useful on Win32, we - * try to map them as best we can from the _finddata.attrib field. - * - * The relevant Microsoft manifest values are: - * - * _A_NORMAL (0x0000) normal file: best fit for DT_REG - * _A_RDONLY (0x0001) read-only: no BSD d_type equivalent - * _A_HIDDEN (0x0002) hidden entity: no BSD equivalent - * _A_SYSTEM (0x0004) system entity: no BSD equivalent - * _A_VOLID (0x0008) volume label: no BSD equivalent - * _A_SUBDIR (0x0010) directory: best fit for DT_DIR - * _A_ARCH (0x0020) "dirty": no BSD equivalent - * - * Thus, we may immediately define: - */ -#define DT_REG _A_NORMAL -#define DT_DIR _A_SUBDIR + return error; +} -/* The remaining BSD d_type manifest values have no Win32 equivalents; - * we will define them artificially, and then we will ensure that our - * opendir()/readdir() implementation will never assign them; (we will - * substitute DT_UNKNOWN, but it would be unwise to simply make these - * equivalent to that, since an application is likely to simply check - * for d_type equal to any one of these defined types, and thus could - * mistakenly identify DT_UNKNOWN as being of the tested type): - */ -#define DT_BLK (((_A_SUBDIR) << 4) | DT_UNKNOWN) -#define DT_CHR (((_A_SUBDIR) << 5) | DT_UNKNOWN) -#define DT_FIFO (((_A_SUBDIR) << 6) | DT_UNKNOWN) -#define DT_LNK (((_A_SUBDIR) << 7) | DT_UNKNOWN) -#define DT_SOCK (((_A_SUBDIR) << 8) | DT_UNKNOWN) +/* Convert wide-character string to multi-byte string */ +static int +dirent_wcstombs_s( + size_t *pReturnValue, + char *mbstr, + size_t sizeInBytes, /* max size of mbstr */ + const wchar_t *wcstr, + size_t count) +{ + int error; -/* No file system entity can ever be simultaneously a volume label - * and a directory; we will exploit this to unambiguously define: - */ -#define DT_UNKNOWN (_A_VOLID | _A_SUBDIR) +#if defined(_MSC_VER) && _MSC_VER >= 1400 -#endif /* _BSD_SOURCE */ -#endif /* ! RC_INVOKED */ + /* Microsoft Visual Studio 2005 or later */ + error = wcstombs_s (pReturnValue, mbstr, sizeInBytes, wcstr, count); + +#else + + /* Older Visual Studio or non-Microsoft compiler */ + size_t n; + + /* Convert to multi-byte string (or count the number of bytes needed) */ + n = wcstombs (mbstr, wcstr, sizeInBytes); + if (!mbstr || n < count) { + + /* Zero-terminate output buffer */ + if (mbstr && sizeInBytes) { + if (n >= sizeInBytes) { + n = sizeInBytes - 1; + } + mbstr[n] = '\0'; + } + + /* Length of resulting multi-bytes string WITH zero-terminator */ + if (pReturnValue) { + *pReturnValue = n + 1; + } + + /* Success */ + error = 0; + + } else { + + /* Cannot convert string */ + error = 1; + + } + +#endif + + return error; +} + +/* Set errno variable */ +static void +dirent_set_errno( + int error) +{ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + + /* Microsoft Visual Studio 2005 and later */ + _set_errno (error); + +#else + + /* Non-Microsoft compiler or older Microsoft compiler */ + errno = error; + +#endif +} + + +#ifdef __cplusplus +} +#endif +#endif /*DIRENT_H*/ -#endif /* !defined _DIRENT_H_ */ diff --git a/sysconfig.h b/sysconfig.h index e5460faa..9abf8826 100644 --- a/sysconfig.h +++ b/sysconfig.h @@ -383,7 +383,6 @@ extern "C" { #if ISWINDOWS #include "direntx.h" -#include "direntx.c" #else #include #endif