factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove support for old MSVC versions, KNF

Browse Source
This commit is contained in:
Brent Cook 2015-09-09 06:01:52 -05:00
parent adfb2bf722
commit 5dc6303714
1 changed files with 357 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
include/compat/dirent_msvc.h
View File

@ -54,11 +54,6 @@
/* Indicates that d_namlen field is available in dirent structure */ /* Indicates that d_namlen field is available in dirent structure */
#define _DIRENT_HAVE_D_NAMLEN #define _DIRENT_HAVE_D_NAMLEN
/* Entries missing from MSVC 6.0 */
#if !defined(FILE_ATTRIBUTE_DEVICE)
# define FILE_ATTRIBUTE_DEVICE 0x40
#endif
/* Maximum length of file name */ /* Maximum length of file name */
#if !defined(PATH_MAX) #if !defined(PATH_MAX)
# define PATH_MAX MAX_PATH # define PATH_MAX MAX_PATH
@ -71,16 +66,10 @@
#endif #endif
/* Return the exact length of d_namlen without zero terminator */ /* Return the exact length of d_namlen without zero terminator */
#define _D_EXACT_NAMLEN(p) ((p)->d_namlen) #define _D_EXACT_NAMLEN(p)((p)->d_namlen)
/* Return number of bytes needed to store d_namlen */ /* Return number of bytes needed to store d_namlen */
#define _D_ALLOC_NAMLEN(p) (PATH_MAX) #define _D_ALLOC_NAMLEN(p)(PATH_MAX)
#ifdef __cplusplus
extern "C" {
#endif
/* Wide-character version */ /* Wide-character version */
struct _wdirent { struct _wdirent {
@ -101,20 +90,10 @@ struct _WDIR {
}; };
typedef struct _WDIR _WDIR; typedef struct _WDIR _WDIR;
static _WDIR *_wopendir (const wchar_t *dirname); static _WDIR *_wopendir(const wchar_t *dirname);
static struct _wdirent *_wreaddir (_WDIR *dirp); static struct _wdirent *_wreaddir(_WDIR *dirp);
static int _wclosedir (_WDIR *dirp); static int _wclosedir(_WDIR *dirp);
static void _wrewinddir (_WDIR* dirp); static void _wrewinddir(_WDIR* dirp);
/* For compatibility with Symbian */
#define wdirent _wdirent
#define WDIR _WDIR
#define wopendir _wopendir
#define wreaddir _wreaddir
#define wclosedir _wclosedir
#define wrewinddir _wrewinddir
/* Multi-byte character versions */ /* Multi-byte character versions */
struct dirent { struct dirent {
@ -132,15 +111,14 @@ struct DIR {
}; };
typedef struct DIR DIR; typedef struct DIR DIR;
static DIR *opendir (const char *dirname); static DIR *opendir(const char *dirname);
static struct dirent *readdir (DIR *dirp); static struct dirent *readdir(DIR *dirp);
static int closedir (DIR *dirp); static int closedir(DIR *dirp);
static void rewinddir (DIR* dirp); static void rewinddir(DIR* dirp);
/* Internal utility functions */ /* Internal utility functions */
static WIN32_FIND_DATAW *dirent_first (_WDIR *dirp); static WIN32_FIND_DATAW *dirent_first(_WDIR *dirp);
static WIN32_FIND_DATAW *dirent_next (_WDIR *dirp); static WIN32_FIND_DATAW *dirent_next(_WDIR *dirp);
static int dirent_mbstowcs_s( static int dirent_mbstowcs_s(
size_t *pReturnValue, size_t *pReturnValue,
@ -156,28 +134,25 @@ static int dirent_wcstombs_s(
const wchar_t *wcstr, const wchar_t *wcstr,
size_t count); size_t count);
static void dirent_set_errno (int error);
/* /*
* Open directory stream DIRNAME for read and return a pointer to the * Open directory stream DIRNAME for read and return a pointer to the
* internal working area that is used to retrieve individual directory * internal working area that is used to retrieve individual directory
* entries. * entries.
*/ */
static _WDIR* static _WDIR*
_wopendir( _wopendir(const wchar_t *dirname)
const wchar_t *dirname)
{ {
_WDIR *dirp = NULL; _WDIR *dirp = NULL;
int error; int error;
/* Must have directory name */ /* Must have directory name */
if (dirname == NULL || dirname[0] == '\0') { if (dirname == NULL || dirname[0] == '\0') {
dirent_set_errno (ENOENT); _set_errno(ENOENT);
return NULL; return NULL;
} }
/* Allocate new _WDIR structure */ /* Allocate new _WDIR structure */
dirp = (_WDIR*) malloc (sizeof (struct _WDIR)); dirp =(_WDIR*) malloc(sizeof(struct _WDIR));
if (dirp != NULL) { if (dirp != NULL) {
DWORD n; DWORD n;
@ -187,10 +162,10 @@ _wopendir(
dirp->cached = 0; dirp->cached = 0;
/* Compute the length of full path plus zero terminator */ /* Compute the length of full path plus zero terminator */
n = GetFullPathNameW (dirname, 0, NULL, NULL); n = GetFullPathNameW(dirname, 0, NULL, NULL);
/* Allocate room for absolute directory name and search pattern */ /* Allocate room for absolute directory name and search pattern */
dirp->patt = (wchar_t*) malloc (sizeof (wchar_t) * n + 16); dirp->patt =(wchar_t*) malloc(sizeof(wchar_t) * n + 16);
if (dirp->patt) { if (dirp->patt) {
/* /*
@ -198,14 +173,14 @@ _wopendir(
* allows rewinddir() to function correctly even when current * allows rewinddir() to function correctly even when current
* working directory is changed between opendir() and rewinddir(). * working directory is changed between opendir() and rewinddir().
*/ */
n = GetFullPathNameW (dirname, n, dirp->patt, NULL); n = GetFullPathNameW(dirname, n, dirp->patt, NULL);
if (n > 0) { if (n > 0) {
wchar_t *p; wchar_t *p;
/* Append search pattern \* to the directory name */ /* Append search pattern \* to the directory name */
p = dirp->patt + n; p = dirp->patt + n;
if (dirp->patt < p) { if (dirp->patt < p) {
switch (p[-1]) { switch(p[-1]) {
case '\\': case '\\':
case '/': case '/':
case ':': case ':':
@ -222,18 +197,18 @@ _wopendir(
*p = '\0'; *p = '\0';
/* Open directory stream and retrieve the first entry */ /* Open directory stream and retrieve the first entry */
if (dirent_first (dirp)) { if (dirent_first(dirp)) {
/* Directory stream opened successfully */ /* Directory stream opened successfully */
error = 0; error = 0;
} else { } else {
/* Cannot retrieve first entry */ /* Cannot retrieve first entry */
error = 1; error = 1;
dirent_set_errno (ENOENT); _set_errno(ENOENT);
} }
} else { } else {
/* Cannot retrieve full path name */ /* Cannot retrieve full path name */
dirent_set_errno (ENOENT); _set_errno(ENOENT);
error = 1; error = 1;
} }
@ -249,7 +224,7 @@ _wopendir(
/* Clean up in case of error */ /* Clean up in case of error */
if (error && dirp) { if (error && dirp) {
_wclosedir (dirp); _wclosedir(dirp);
dirp = NULL; dirp = NULL;
} }
@ -263,14 +238,13 @@ _wopendir(
* "." and ".." as well as volume labels, hidden files and system files. * "." and ".." as well as volume labels, hidden files and system files.
*/ */
static struct _wdirent* static struct _wdirent*
_wreaddir( _wreaddir(_WDIR *dirp)
_WDIR *dirp)
{ {
WIN32_FIND_DATAW *datap; WIN32_FIND_DATAW *datap;
struct _wdirent *entp; struct _wdirent *entp;
/* Read next directory entry */ /* Read next directory entry */
datap = dirent_next (dirp); datap = dirent_next(dirp);
if (datap) { if (datap) {
size_t n; size_t n;
DWORD attr; DWORD attr;
@ -284,7 +258,7 @@ _wreaddir(
* to PATH_MAX characters and zero-terminate the buffer. * to PATH_MAX characters and zero-terminate the buffer.
*/ */
n = 0; n = 0;
while (n + 1 < PATH_MAX && datap->cFileName[n] != 0) { while(n + 1 < PATH_MAX && datap->cFileName[n] != 0) {
entp->d_name[n] = datap->cFileName[n]; entp->d_name[n] = datap->cFileName[n];
n++; n++;
} }
@ -305,7 +279,7 @@ _wreaddir(
/* Reset dummy fields */ /* Reset dummy fields */
entp->d_ino = 0; entp->d_ino = 0;
entp->d_reclen = sizeof (struct _wdirent); entp->d_reclen = sizeof(struct _wdirent);
} else { } else {
@ -323,31 +297,30 @@ _wreaddir(
* _wreaddir(). * _wreaddir().
*/ */
static int static int
_wclosedir( _wclosedir(_WDIR *dirp)
_WDIR *dirp)
{ {
int ok; int ok;
if (dirp) { if (dirp) {
/* Release search handle */ /* Release search handle */
if (dirp->handle != INVALID_HANDLE_VALUE) { if (dirp->handle != INVALID_HANDLE_VALUE) {
FindClose (dirp->handle); FindClose(dirp->handle);
dirp->handle = INVALID_HANDLE_VALUE; dirp->handle = INVALID_HANDLE_VALUE;
} }
/* Release search pattern */ /* Release search pattern */
if (dirp->patt) { if (dirp->patt) {
free (dirp->patt); free(dirp->patt);
dirp->patt = NULL; dirp->patt = NULL;
} }
/* Release directory structure */ /* Release directory structure */
free (dirp); free(dirp);
ok = /*success*/0; ok = /*success*/0;
} else { } else {
/* Invalid directory stream */ /* Invalid directory stream */
dirent_set_errno (EBADF); _set_errno(EBADF);
ok = /*failure*/-1; ok = /*failure*/-1;
} }
return ok; return ok;
@ -358,29 +331,27 @@ _wclosedir(
* file name again. * file name again.
*/ */
static void static void
_wrewinddir( _wrewinddir(_WDIR* dirp)
_WDIR* dirp)
{ {
if (dirp) { if (dirp) {
/* Release existing search handle */ /* Release existing search handle */
if (dirp->handle != INVALID_HANDLE_VALUE) { if (dirp->handle != INVALID_HANDLE_VALUE) {
FindClose (dirp->handle); FindClose(dirp->handle);
} }
/* Open new search handle */ /* Open new search handle */
dirent_first (dirp); dirent_first(dirp);
} }
} }
/* Get first directory entry (internal) */ /* Get first directory entry(internal) */
static WIN32_FIND_DATAW* static WIN32_FIND_DATAW*
dirent_first( dirent_first(_WDIR *dirp)
_WDIR *dirp)
{ {
WIN32_FIND_DATAW *datap; WIN32_FIND_DATAW *datap;
/* Open directory and retrieve the first entry */ /* Open directory and retrieve the first entry */
dirp->handle = FindFirstFileW (dirp->patt, &dirp->data); dirp->handle = FindFirstFileW(dirp->patt, &dirp->data);
if (dirp->handle != INVALID_HANDLE_VALUE) { if (dirp->handle != INVALID_HANDLE_VALUE) {
/* a directory entry is now waiting in memory */ /* a directory entry is now waiting in memory */
@ -397,10 +368,9 @@ dirent_first(
return datap; return datap;
} }
/* Get next directory entry (internal) */ /* Get next directory entry(internal) */
static WIN32_FIND_DATAW* static WIN32_FIND_DATAW*
dirent_next( dirent_next(_WDIR *dirp)
_WDIR *dirp)
{ {
WIN32_FIND_DATAW *p; WIN32_FIND_DATAW *p;
@ -414,12 +384,12 @@ dirent_next(
} else if (dirp->handle != INVALID_HANDLE_VALUE) { } else if (dirp->handle != INVALID_HANDLE_VALUE) {
/* Get the next directory entry from stream */ /* Get the next directory entry from stream */
if (FindNextFileW (dirp->handle, &dirp->data) != FALSE) { if (FindNextFileW(dirp->handle, &dirp->data) != FALSE) {
/* Got a file */ /* Got a file */
p = &dirp->data; p = &dirp->data;
} else { } else {
/* The very last entry has been processed or an error occured */ /* The very last entry has been processed or an error occured */
FindClose (dirp->handle); FindClose(dirp->handle);
dirp->handle = INVALID_HANDLE_VALUE; dirp->handle = INVALID_HANDLE_VALUE;
p = NULL; p = NULL;
} }
@ -438,30 +408,29 @@ dirent_next(
* Open directory stream using plain old C-string. * Open directory stream using plain old C-string.
*/ */
static DIR* static DIR*
opendir( opendir(const char *dirname)
const char *dirname)
{ {
struct DIR *dirp; struct DIR *dirp;
int error; int error;
/* Must have directory name */ /* Must have directory name */
if (dirname == NULL || dirname[0] == '\0') { if (dirname == NULL || dirname[0] == '\0') {
dirent_set_errno (ENOENT); _set_errno(ENOENT);
return NULL; return NULL;
} }
/* Allocate memory for DIR structure */ /* Allocate memory for DIR structure */
dirp = (DIR*) malloc (sizeof (struct DIR)); dirp =(DIR*) malloc(sizeof(struct DIR));
if (dirp) { if (dirp) {
wchar_t wname[PATH_MAX]; wchar_t wname[PATH_MAX];
size_t n; size_t n;
/* Convert directory name to wide-character string */ /* Convert directory name to wide-character string */
error = dirent_mbstowcs_s (&n, wname, PATH_MAX, dirname, PATH_MAX); error = dirent_mbstowcs_s(&n, wname, PATH_MAX, dirname, PATH_MAX);
if (!error) { if (!error) {
/* Open directory stream using wide-character name */ /* Open directory stream using wide-character name */
dirp->wdirp = _wopendir (wname); dirp->wdirp = _wopendir(wname);
if (dirp->wdirp) { if (dirp->wdirp) {
/* Directory stream opened */ /* Directory stream opened */
error = 0; error = 0;
@ -487,7 +456,7 @@ opendir(
/* Clean up in case of error */ /* Clean up in case of error */
if (error && dirp) { if (error && dirp) {
free (dirp); free(dirp);
dirp = NULL; dirp = NULL;
} }
@ -501,21 +470,20 @@ opendir(
* readdir() are represented in the default ANSI code page while any output to * readdir() are represented in the default ANSI code page while any output to
* console is typically formatted on another code page. Thus, non-ASCII * console is typically formatted on another code page. Thus, non-ASCII
* characters in file names will not usually display correctly on console. The * characters in file names will not usually display correctly on console. The
* problem can be fixed in two ways: (1) change the character set of console * problem can be fixed in two ways:(1) change the character set of console
* to 1252 using chcp utility and use Lucida Console font, or (2) use * to 1252 using chcp utility and use Lucida Console font, or(2) use
* _cprintf function when writing to console. The _cprinf() will re-encode * _cprintf function when writing to console. The _cprinf() will re-encode
* ANSI strings to the console code page so many non-ASCII characters will * ANSI strings to the console code page so many non-ASCII characters will
* display correcly. * display correcly.
*/ */
static struct dirent* static struct dirent*
readdir( readdir(DIR *dirp)
DIR *dirp)
{ {
WIN32_FIND_DATAW *datap; WIN32_FIND_DATAW *datap;
struct dirent *entp; struct dirent *entp;
/* Read next directory entry */ /* Read next directory entry */
datap = dirent_next (dirp->wdirp); datap = dirent_next(dirp->wdirp);
if (datap) { if (datap) {
size_t n; size_t n;
int error; int error;
@ -561,7 +529,7 @@ readdir(
/* Reset dummy fields */ /* Reset dummy fields */
entp->d_ino = 0; entp->d_ino = 0;
entp->d_reclen = sizeof (struct dirent); entp->d_reclen = sizeof(struct dirent);
} else { } else {
/* /*
@ -591,23 +559,22 @@ readdir(
* Close directory stream. * Close directory stream.
*/ */
static int static int
closedir( closedir(DIR *dirp)
DIR *dirp)
{ {
int ok; int ok;
if (dirp) { if (dirp) {
/* Close wide-character directory stream */ /* Close wide-character directory stream */
ok = _wclosedir (dirp->wdirp); ok = _wclosedir(dirp->wdirp);
dirp->wdirp = NULL; dirp->wdirp = NULL;
/* Release multi-byte character version */ /* Release multi-byte character version */
free (dirp); free(dirp);
} else { } else {
/* Invalid directory stream */ /* Invalid directory stream */
dirent_set_errno (EBADF); _set_errno(EBADF);
ok = /*failure*/-1; ok = /*failure*/-1;
} }
@ -618,140 +585,27 @@ closedir(
* Rewind directory stream to beginning. * Rewind directory stream to beginning.
*/ */
static void static void
rewinddir( rewinddir(DIR* dirp)
DIR* dirp)
{ {
/* Rewind wide-character string directory stream */ /* Rewind wide-character string directory stream */
_wrewinddir (dirp->wdirp); _wrewinddir(dirp->wdirp);
} }
/* Convert multi-byte string to wide character string */ /* Convert multi-byte string to wide character string */
static int static int
dirent_mbstowcs_s( dirent_mbstowcs_s(size_t *pReturnValue, wchar_t *wcstr,
size_t *pReturnValue, size_t sizeInWords, const char *mbstr, size_t count)
wchar_t *wcstr,
size_t sizeInWords,
const char *mbstr,
size_t count)
{ {
int error; return mbstowcs_s(pReturnValue, wcstr, sizeInWords, mbstr, count);
#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 resuting multi-byte string WITH zero terminator */
if (pReturnValue) {
*pReturnValue = n + 1;
}
/* Success */
error = 0;
} else {
/* Could not convert string */
error = 1;
}
#endif
return error;
} }
/* Convert wide-character string to multi-byte string */ /* Convert wide-character string to multi-byte string */
static int static int
dirent_wcstombs_s( dirent_wcstombs_s(size_t *pReturnValue, char *mbstr,
size_t *pReturnValue,
char *mbstr,
size_t sizeInBytes, /* max size of mbstr */ size_t sizeInBytes, /* max size of mbstr */
const wchar_t *wcstr, const wchar_t *wcstr, size_t count)
size_t count)
{ {
int error; return wcstombs_s(pReturnValue, mbstr, sizeInBytes, wcstr, count);
#if defined(_MSC_VER) && _MSC_VER >= 1400
/* 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';
}
/* Lenght 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 /*DIRENT_H*/