From 24a7f0787b2e5a1714b575695bfdf24344cf62d8 Mon Sep 17 00:00:00 2001 From: LRN Date: Fri, 16 Aug 2013 04:08:08 +0000 Subject: Modernize plibc, use MinGW ANSI STDIO --- src/include/plibc.h | 84 +++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 64 deletions(-) (limited to 'src/include/plibc.h') diff --git a/src/include/plibc.h b/src/include/plibc.h index 7ef80acaf..d19037728 100644 --- a/src/include/plibc.h +++ b/src/include/plibc.h @@ -558,9 +558,7 @@ int _win_creat(const char *path, mode_t mode); char *_win_ctime(const time_t *clock); char *_win_ctime_r(const time_t *clock, char *buf); int _win_fstat(int handle, struct stat *buffer); -off_t _win_lseek(int fildes, off_t offset, int whence); int _win_ftruncate(int fildes, off_t length); -void _win_gettimeofday(struct timeval *tp, void *tzp); int _win_kill(pid_t pid, int sig); int _win_pipe(int *phandles); intptr_t _win_mkfifo(const char *path, mode_t mode); @@ -590,49 +588,6 @@ int _win_lstat64(const char *path, struct stat64 *buf); int _win_readlink(const char *path, char *buf, size_t bufsize); int _win_accept(int s, struct sockaddr *addr, int *addrlen); -int _win_printf(const char *format,...); -int _win_wprintf(const wchar_t *format, ...); - -int _win_fprintf(FILE *f,const char *format,...); -int _win_fwprintf(FILE *f,const wchar_t *format, ...); - -int _win_vprintf(const char *format, va_list ap); -int _win_vfwprintf(FILE *stream, const wchar_t *format, va_list arg_ptr); - -int _win_vfprintf(FILE *stream, const char *format, va_list arg_ptr); -int _win_vwprintf(const wchar_t *format, va_list ap); - -int _win_vsprintf(char *dest,const char *format, va_list arg_ptr); -int _win_vswprintf(wchar_t *dest, const wchar_t *format, va_list arg_ptr); - -int _win_vsnprintf(char* str, size_t size, const char *format, va_list arg_ptr); -int _win_vsnwprintf(wchar_t* wstr, size_t size, const wchar_t *format, va_list arg_ptr); - -int _win_snprintf(char *str,size_t size,const char *format,...); -int _win_snwprintf(wchar_t *str, size_t size, const wchar_t *format, ...); - -int _win_sprintf(char *dest,const char *format,...); -int _win_swprintf(wchar_t *dest, const wchar_t *format, ...); - -int _win_vsscanf(const char* str, const char* format, va_list arg_ptr); -int _win_vswscanf(const wchar_t* wstr, const wchar_t* format, va_list arg_ptr); - -int _win_sscanf(const char *str, const char *format, ...); -int _win_swscanf(const wchar_t *wstr, const wchar_t *format, ...); - -int _win_vfscanf(FILE *stream, const char *format, va_list arg_ptr); -int _win_vfwscanf(FILE *stream, const wchar_t *format, va_list arg_ptr); - -int _win_vscanf(const char *format, va_list arg_ptr); -int _win_vwscanf(const wchar_t *format, va_list arg_ptr); - -int _win_scanf(const char *format, ...); -int _win_wscanf(const wchar_t *format, ...); - -int _win_fscanf(FILE *stream, const char *format, ...); -int _win_fwscanf(FILE *stream, const wchar_t *format, ...); - - pid_t _win_waitpid(pid_t pid, int *stat_loc, int options); int _win_bind(int s, const struct sockaddr *name, int namelen); int _win_connect(int s,const struct sockaddr *name, int namelen); @@ -661,6 +616,7 @@ struct hostent *gethostbyname2(const char *name, int af); char *_win_strerror(int errnum); int IsWinNT(); char *index(const char *s, int c); +char *_win_strtok_r (char *ptr, const char *sep, char **end); #if !HAVE_STRNDUP char *strndup (const char *s, size_t n); @@ -668,9 +624,6 @@ char *strndup (const char *s, size_t n); #if !HAVE_STRNLEN && (!defined(__MINGW64_VERSION_MAJOR) || !defined(_INC_STRING)) size_t strnlen (const char *str, size_t maxlen); #endif -#if !HAVE_STRTOK_R -char *strtok_r (char *ptr, const char *sep, char **end); -#endif char *stpcpy(char *dest, const char *src); char *strcasestr(const char *haystack_start, const char *needle_start); #ifndef __MINGW64_VERSION_MAJOR @@ -683,6 +636,9 @@ char *strcasestr(const char *haystack_start, const char *needle_start); #ifndef wcsncasecmp #define wcsncasecmp(a, b, c) wcsnicmp(a, b, c) #endif +#ifndef strtok_r /* winpthreads defines it in pthread.h */ +#define strtok_r _win_strtok_r +#endif #endif /* WINDOWS */ #ifndef WINDOWS @@ -807,7 +763,7 @@ char *strcasestr(const char *haystack_start, const char *needle_start); #define CHDIR(d) _win_chdir(d) #define CLOSE(f) _win_close(f) #define PLIBC_KILL(p, s) _win_kill(p, s) - #define LSEEK(f, o, w) _win_lseek(f, o, w) + #define LSEEK(f, o, w) lseek(f, o, w) #define FSTAT(h, b) _win_fstat(h, b) #define RMDIR(f) _win_rmdir(f) #define ACCESS(p, m) _win_access(p, m) @@ -834,20 +790,20 @@ char *strcasestr(const char *haystack_start, const char *needle_start); #define READLINK(p, b, s) _win_readlink(p, b, s) #define LSTAT(p, b) _win_lstat(p, b) #define LSTAT64(p, b) _win_lstat64(p, b) - #define PRINTF(f, ...) _win_printf(f , __VA_ARGS__) - #define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__) - #define VPRINTF(f, a) _win_vprintf(f, a) - #define VFPRINTF(s, f, a) _win_vfprintf(s, f, a) - #define VSPRINTF(d, f, a) _win_vsprintf(d, f, a) - #define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a) - #define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt, __VA_ARGS__) - #define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__) - #define VSSCANF(s, f, a) _win_vsscanf(s, f, a) - #define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__) - #define VFSCANF(s, f, a) _win_vfscanf(s, f, a) - #define VSCANF(f, a) _win_vscanf(f, a) - #define SCANF(f, ...) _win_scanf(f, __VA_ARGS__) - #define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__) + #define PRINTF printf + #define FPRINTF fprintf + #define VPRINTF(f, a) vprintf(f, a) + #define VFPRINTF(s, f, a) vfprintf(s, f, a) + #define VSPRINTF(d, f, a) vsprintf(d, f, a) + #define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a) + #define _REAL_SNPRINTF snprintf + #define SPRINTF sprintf + #define VSSCANF(s, f, a) vsscanf(s, f, a) + #define SSCANF sscanf + #define VFSCANF(s, f, a) vfscanf(s, f, a) + #define VSCANF(f, a) vscanf(f, a) + #define SCANF scanf + #define FSCANF fscanf #define WAITPID(p, s, o) _win_waitpid(p, s, o) #define ACCEPT(s, a, l) _win_accept(s, a, l) #define BIND(s, n, l) _win_bind(s, n, l) @@ -866,7 +822,7 @@ char *strcasestr(const char *haystack_start, const char *needle_start); #define SOCKET(a, t, p) _win_socket(a, t, p) #define GETHOSTBYADDR(a, l, t) _win_gethostbyaddr(a, l, t) #define GETHOSTBYNAME(n) _win_gethostbyname(n) - #define GETTIMEOFDAY(t, n) _win_gettimeofday(t, n) + #define GETTIMEOFDAY(t, n) gettimeofday(t, n) #define INSQUE(e, p) _win_insque(e, p) #define REMQUE(e) _win_remque(e) #define HSEARCH(i, a) _win_hsearch(i, a) -- cgit v1.2.3