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

190
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
@ -76,12 +71,6 @@
/* 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 {
long d_ino; /* Always zero */ long d_ino; /* Always zero */
@ -106,16 +95,6 @@ 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 {
long d_ino; /* Always zero */ long d_ino; /* Always zero */
@ -137,7 +116,6 @@ 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);
@ -156,23 +134,20 @@ 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;
} }
@ -228,12 +203,12 @@ _wopendir(
} 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;
} }
@ -263,8 +238,7 @@ _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;
@ -323,8 +297,7 @@ _wreaddir(
* _wreaddir(). * _wreaddir().
*/ */
static int static int
_wclosedir( _wclosedir(_WDIR *dirp)
_WDIR *dirp)
{ {
int ok; int ok;
if (dirp) { if (dirp) {
@ -347,7 +320,7 @@ _wclosedir(
} 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,8 +331,7 @@ _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 */
@ -374,8 +346,7 @@ _wrewinddir(
/* 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;
@ -399,8 +370,7 @@ dirent_first(
/* 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;
@ -438,15 +408,14 @@ 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;
} }
@ -508,8 +477,7 @@ opendir(
* 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;
@ -591,8 +559,7 @@ 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) {
@ -607,7 +574,7 @@ closedir(
} else { } else {
/* Invalid directory stream */ /* Invalid directory stream */
dirent_set_errno (EBADF); _set_errno(EBADF);
ok = /*failure*/-1; ok = /*failure*/-1;
} }
@ -618,8 +585,7 @@ 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);
@ -627,131 +593,19 @@ rewinddir(
/* 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*/