diff -ruNa polipo-harden-test/Makefile polipoo/Makefile --- polipo-harden-test/Makefile 2009-12-12 07:39:48 +0800 +++ polipoo/Makefile 2010-01-22 18:38:41 +0800 @@ -11,7 +11,7 @@ # To compile with GCC: -# CC = gcc +CC = gcc # CDEBUGFLAGS = -Os -g -Wall -std=gnu99 CDEBUGFLAGS = -Os -g -Wall -Wextra # CDEBUGFLAGS = -Os -Wall @@ -47,8 +47,8 @@ # On mingw, you need -# EXE=.exe -# LDLIBS = -lwsock32 +EXE=.exe +LDLIBS = -lwsock32 FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \ -DDISK_CACHE_ROOT=\"$(DISK_CACHE_ROOT)/\" diff -ruNa polipo-harden-test/chunk.c polipoo/chunk.c --- polipo-harden-test/chunk.c 2009-12-12 07:39:48 +0800 +++ polipoo/chunk.c 2010-01-22 14:48:40 +0800 @@ -184,7 +184,7 @@ } #else -#ifdef MINGW +#ifdef WIN32 /*MINGW*/ #define MAP_FAILED NULL #define getpagesize() (64 * 1024) static void * diff -ruNa polipo-harden-test/dirent.c polipoo/dirent.c --- polipo-harden-test/dirent.c 1970-01-01 08:00:00 +0800 +++ polipoo/dirent.c 2010-01-22 14:58:22 +0800 @@ -0,0 +1,214 @@ +/** dirent.c: emulates POSIX directory readin functions: opendir(), readdir(), + * etc. under Win32 + */ + +#include +#include +#include +#include +#include +#include "dirent.h" + +struct DIR +{ + HANDLE hFind; + char szDirName[1]; +}; + +/*-------------------------------------------------------------------------- + Name countslashes + + Description +--------------------------------------------------------------------------*/ + +static int countslashes(const char *dirname) +{ + const char *p; + int n; + + n = 0; + p = dirname; + + while (*p) + if (*p++ == '\\') + ++n; + + return n; +} + +/*-------------------------------------------------------------------------- +* Name opendir +* +* Description +--------------------------------------------------------------------------*/ +DIR * opendir ( const char * dirname ) +{ + DIR * dir; + int nameLen; + struct stat st; + unsigned char flagNetPath; + unsigned char flagRootOnly; + + if (dirname == NULL || *dirname == 0) + { + errno = EINVAL; + return NULL; + } + + nameLen = strlen( dirname ); + flagNetPath = 0; + if (dirname[0] == '\\' && dirname[1] == '\\') + flagNetPath = 1; + /* we have to check for root-dir-only case */ + flagRootOnly = 0; + if (flagNetPath) + { + if (countslashes(&dirname[2]) == 2) /* only the separation for server_name and the root*/ + flagRootOnly = 1; + } + + if ((dirname[nameLen-1] == '/' || dirname[nameLen-1] == '\\') && + (nameLen != 3 || dirname[1] != ':') && nameLen != 1 && !flagRootOnly) + { + char * t = alloca( nameLen ); + memcpy( t, dirname, nameLen ); + t[nameLen-1] = 0; + dirname = t; + --nameLen; + } + + if (stat( dirname, &st )) + return NULL; + + if ((st.st_mode & S_IFDIR) == 0) + { + /* this is not a DIR */ + errno = ENOTDIR; + return NULL; + } + + if ((dir = malloc( sizeof( DIR ) + nameLen + 2 )) == NULL) + { + errno = ENOMEM; + return NULL; + } + + dir->hFind = INVALID_HANDLE_VALUE; + + memcpy( dir->szDirName, dirname, nameLen ); + if (nameLen && dirname[nameLen-1] != ':' && dirname[nameLen-1] != '\\' && + dirname[nameLen-1] != '/') + { + dir->szDirName[nameLen++] = '\\'; + } + dir->szDirName[nameLen] = '*'; + dir->szDirName[nameLen+1] = 0; + + return dir; +}; + +/*-------------------------------------------------------------------------- + * Name readdir + * + * Description +--------------------------------------------------------------------------*/ +struct dirent * readdir ( DIR * dir ) +{ + static WIN32_FIND_DATA fData; + + if (dir == NULL) + { + errno = EBADF; + return NULL; + } + + do + { + int ok = 1; + + if (dir->hFind == INVALID_HANDLE_VALUE) + { + dir->hFind = FindFirstFile( dir->szDirName, &fData ); + if (dir->hFind == INVALID_HANDLE_VALUE) + ok = 0; + } + else + if (!FindNextFile( dir->hFind, &fData )) + ok = 0; + + if (!ok) + { + switch (GetLastError()) + { + case ERROR_NO_MORE_FILES: + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + errno = ENOENT; + break; + + case ERROR_NOT_ENOUGH_MEMORY: + errno = ENOMEM; + break; + + default: + errno = EINVAL; + break; + } + return NULL; + } + } + while (fData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN); + + return (struct dirent *)&fData.cFileName; +}; + +/*-------------------------------------------------------------------------- + * Name closedir +--------------------------------------------------------------------------*/ +int closedir ( DIR * dir ) +{ + if (dir == NULL) + { + errno = EBADF; + return -1; + } + if (dir->hFind != INVALID_HANDLE_VALUE) + FindClose( dir->hFind ); + free( dir ); + return 0; +}; + +/*-------------------------------------------------------------------------- + Name rewinddir + Description +--------------------------------------------------------------------------*/ +void rewinddir ( DIR * dir ) +{ + if (dir) + { + if (dir->hFind != INVALID_HANDLE_VALUE) + FindClose( dir->hFind ); + dir->hFind = INVALID_HANDLE_VALUE; + } +}; + +/* +int main ( int argc, char ** argv ) +{ + DIR * dir; + struct dirent * de; + char * arg; + + arg = argc > 1 ? argv[1] : "."; + + if (dir = opendir( arg )) + { + while (de = readdir( dir )) + { + puts( de->d_name ); + } + closedir( dir ); + } + return 0; +}; +*/ diff -ruNa polipo-harden-test/dirent.h polipoo/dirent.h --- polipo-harden-test/dirent.h 1970-01-01 08:00:00 +0800 +++ polipoo/dirent.h 2010-01-22 15:02:52 +0800 @@ -0,0 +1,22 @@ + +#ifndef DIRENT_H +#define DIRENT_H + +#include + +struct dirent +{ + long d_ino; /* Always zero. */ + unsigned short d_reclen; /* Always zero. */ + unsigned short d_namlen; /* Length of name in d_name. */ + char d_name[FILENAME_MAX+1]; /* File name. */ +}; + +typedef struct DIR DIR; + +DIR * opendir ( const char * dirname ); +struct dirent * readdir ( DIR * dir ); +int closedir ( DIR * dir ); +void rewinddir ( DIR * dir ); + +#endif /* DIRENT_H */ diff -ruNa polipo-harden-test/event.h polipoo/event.h --- polipo-harden-test/event.h 2009-12-12 07:39:48 +0800 +++ polipoo/event.h 2010-01-12 20:55:05 +0800 @@ -52,7 +52,10 @@ void initEvents(void); void uninitEvents(void); + +#ifdef HAVE_FORK void interestingSignals(sigset_t *ss); +#endif TimeEventHandlerPtr scheduleTimeEvent(int seconds, int (*handler)(TimeEventHandlerPtr), diff -ruNa polipo-harden-test/fts_compat.c polipoo/fts_compat.c --- polipo-harden-test/fts_compat.c 2009-12-12 07:39:48 +0800 +++ polipoo/fts_compat.c 2010-01-22 14:48:40 +0800 @@ -25,13 +25,23 @@ #include #include -#include + +#ifdef _MSC_VER + #include "polipo.h" + #include +#else + #include + #include +#endif + #include -#include + #include #include #include + + #include "fts_compat.h" static char * @@ -127,7 +137,7 @@ /* * Make the directory identified by the argument the current directory. */ -#ifdef MINGW +#ifdef WIN32 /*MINGW*/ int change_to_dir(DIR *dir) { @@ -281,13 +291,13 @@ name = dirent->d_name; again2: - rc = stat(name, &fts->stat); + rc = stat(name, &fts->istat); if(rc < 0) { fts->ftsent.fts_info = FTS_NS; goto error2; } - if(S_ISDIR(fts->stat.st_mode)) { + if(S_ISDIR(fts->istat.st_mode)) { char *newcwd; DIR *dir; @@ -318,11 +328,11 @@ fts->depth++; fts->dir[fts->depth] = dir; goto done; - } else if(S_ISREG(fts->stat.st_mode)) { + } else if(S_ISREG(fts->istat.st_mode)) { fts->ftsent.fts_info = FTS_F; goto done; #ifdef S_ISLNK - } else if(S_ISLNK(fts->stat.st_mode)) { + } else if(S_ISLNK(fts->istat.st_mode)) { int rc; rc = readlink(name, buf, 1024); if(rc < 0) @@ -350,7 +360,7 @@ fts->ftsent.fts_path = mkfilename(fts->cwd, name); if(fts->ftsent.fts_path == NULL) goto error; fts->ftsent.fts_accpath = name; - fts->ftsent.fts_statp = &fts->stat; + fts->ftsent.fts_statp = &fts->istat; return &fts->ftsent; error: diff -ruNa polipo-harden-test/fts_compat.h polipoo/fts_compat.h --- polipo-harden-test/fts_compat.h 2009-12-12 07:39:48 +0800 +++ polipoo/fts_compat.h 2010-01-22 15:03:06 +0800 @@ -50,12 +50,18 @@ typedef struct _FTSENT FTSENT; +#ifdef _MSC_VER +#include "dirent.h" +#else +#include +#endif + struct _FTS { int depth; DIR *dir[FTS_MAX_DEPTH]; char *cwd0, *cwd; struct _FTSENT ftsent; - struct stat stat; + struct stat istat; char *dname; }; diff -ruNa polipo-harden-test/io.c polipoo/io.c --- polipo-harden-test/io.c 2009-12-12 07:39:48 +0800 +++ polipoo/io.c 2010-01-22 14:48:40 +0800 @@ -801,8 +801,8 @@ int setNonblocking(int fd, int nonblocking) { -#ifdef MINGW - return mingw_setnonblocking(fd, nonblocking); +#ifdef WIN32 /*MINGW*/ + return win32_setnonblocking(fd, nonblocking); #else int rc; rc = fcntl(fd, F_GETFL, 0); diff -ruNa polipo-harden-test/local.h polipoo/local.h --- polipo-harden-test/local.h 2009-12-12 07:39:48 +0800 +++ polipoo/local.h 2010-01-12 16:13:56 +0800 @@ -20,6 +20,11 @@ THE SOFTWARE. */ +#ifdef _MSC_VER + typedef int pid_t; +#endif + + typedef struct _SpecialRequest { ObjectPtr object; int fd; diff -ruNa polipo-harden-test/log.c polipoo/log.c --- polipo-harden-test/log.c 2009-12-12 07:39:48 +0800 +++ polipoo/log.c 2010-01-13 20:47:45 +0800 @@ -304,10 +304,6 @@ } } -#ifndef va_copy -#define va_copy(a, b) do { a = b; } while(0) -#endif - static void accumulateSyslogV(int type, const char *f, va_list args) { diff -ruNa polipo-harden-test/main.c polipoo/main.c --- polipo-harden-test/main.c 2009-12-12 07:39:48 +0800 +++ polipoo/main.c 2010-01-22 11:42:51 +0800 @@ -38,6 +38,13 @@ fprintf(stderr, " -c: specify the configuration file to use.\n"); } +#ifndef WIN32 + #define DEFAULT_CONFIG_PATH "/etc/polipo/config" +#else + #define DEFAULT_CONFIG_PATH "./config" +#endif + + int main(int argc, char **argv) { @@ -107,8 +114,8 @@ } if(configFile == NULL) { - if(access("/etc/polipo/config", F_OK) >= 0) - configFile = internAtom("/etc/polipo/config"); + if(access( DEFAULT_CONFIG_PATH, F_OK) >= 0) + configFile = internAtom( DEFAULT_CONFIG_PATH ); if(configFile && access(configFile->string, F_OK) < 0) { releaseAtom(configFile); configFile = NULL; diff -ruNa polipo-harden-test/md5.h polipoo/md5.h --- polipo-harden-test/md5.h 2009-12-12 07:39:48 +0800 +++ polipoo/md5.h 2010-01-22 15:00:57 +0800 @@ -35,7 +35,19 @@ #ifdef HAS_STDINT_H #include #elif defined(HAS_INTTYPES_H) -#include +#ifdef _MSC_VER +typedef __int8 int8_t; +typedef __int16 int16_t; +typedef __int32 int32_t; +typedef __int64 int64_t; +typedef unsigned __int8 uint8_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; +#else + #include +#endif + #endif /* typedef a 32-bit type */ diff -ruNa polipo-harden-test/mingw.c polipoo/mingw.c --- polipo-harden-test/mingw.c 2009-12-12 07:39:48 +0800 +++ polipoo/mingw.c 2010-01-22 14:48:40 +0800 @@ -23,7 +23,7 @@ #include "polipo.h" -#ifndef MINGW +#ifndef WIN32 /*MINGW*/ static int dummy ATTRIBUTE((unused)); @@ -53,7 +53,7 @@ * (with trivial modifications) from the OpenBSD project. */ int -mingw_inet_aton(const char *cp, struct in_addr *addr) +win32_inet_aton(const char *cp, struct in_addr *addr) { register unsigned int val; register int base, n; @@ -148,14 +148,14 @@ } unsigned int -mingw_sleep(unsigned int seconds) +win32_sleep(unsigned int seconds) { Sleep(seconds * 1000); return 0; } int -mingw_gettimeofday(struct timeval *tv, char *tz) +win32_gettimeofday(struct timeval *tv, char *tz) { const long long EPOCHFILETIME = (116444736000000000LL); FILETIME ft; @@ -183,7 +183,7 @@ return 0; } -int mingw_poll(struct pollfd *fds, unsigned int nfds, int timo) +int win32_poll(struct pollfd *fds, unsigned int nfds, int timo) { struct timeval timeout, *toptr; fd_set ifds, ofds, efds, *ip, *op; @@ -248,7 +248,7 @@ return rc; } -int mingw_close_socket(SOCKET fd) { +int win32_close_socket(SOCKET fd) { int rc; rc = closesocket(fd); @@ -268,7 +268,7 @@ } } -int mingw_write_socket(SOCKET fd, void *buf, int n) +int win32_write_socket(SOCKET fd, void *buf, int n) { int rc = send(fd, buf, n, 0); if(rc == SOCKET_ERROR) { @@ -277,7 +277,7 @@ return rc; } -int mingw_read_socket(SOCKET fd, void *buf, int n) +int win32_read_socket(SOCKET fd, void *buf, int n) { int rc = recv(fd, buf, n, 0); if(rc == SOCKET_ERROR) { @@ -294,7 +294,7 @@ * is successful, other -1. */ int -mingw_setnonblocking(SOCKET fd, int nonblocking) +win32_setnonblocking(SOCKET fd, int nonblocking) { int rc; @@ -312,7 +312,7 @@ * even if we are using winsock. */ SOCKET -mingw_socket(int domain, int type, int protocol) +win32_socket(int domain, int type, int protocol) { SOCKET fd = socket(domain, type, protocol); if(fd == INVALID_SOCKET) { @@ -342,7 +342,7 @@ * even if we are using winsock. */ int -mingw_connect(SOCKET fd, struct sockaddr *addr, socklen_t addr_len) +win32_connect(SOCKET fd, struct sockaddr *addr, socklen_t addr_len) { int rc = connect(fd, addr, addr_len); assert(rc == 0 || rc == SOCKET_ERROR); @@ -358,7 +358,7 @@ * even if we are using winsock. */ SOCKET -mingw_accept(SOCKET fd, struct sockaddr *addr, socklen_t *addr_len) +win32_accept(SOCKET fd, struct sockaddr *addr, socklen_t *addr_len) { SOCKET newfd = accept(fd, addr, addr_len); if(newfd == INVALID_SOCKET) { @@ -374,7 +374,7 @@ * even if we are using winsock. */ int -mingw_shutdown(SOCKET fd, int mode) +win32_shutdown(SOCKET fd, int mode) { int rc = shutdown(fd, mode); assert(rc == 0 || rc == SOCKET_ERROR); @@ -390,7 +390,7 @@ * even if we are using winsock. */ int -mingw_getpeername(SOCKET fd, struct sockaddr *name, socklen_t *namelen) +win32_getpeername(SOCKET fd, struct sockaddr *name, socklen_t *namelen) { int rc = getpeername(fd, name, namelen); assert(rc == 0 || rc == SOCKET_ERROR); @@ -403,7 +403,7 @@ /* Stat doesn't work on directories if the name ends in a slash. */ int -mingw_stat(const char *filename, struct stat *ss) +win32_stat(const char *filename, struct stat *ss) { int len, rc, saved_errno; char *noslash; @@ -425,7 +425,7 @@ errno = saved_errno; return rc; } -#endif /* #ifdef MINGW */ +#endif /* #ifdef WIN32 MINGW */ #ifndef HAVE_READV_WRITEV diff -ruNa polipo-harden-test/mingw.h polipoo/mingw.h --- polipo-harden-test/mingw.h 2009-12-12 07:39:48 +0800 +++ polipoo/mingw.h 2010-01-22 15:11:56 +0800 @@ -32,7 +32,7 @@ * symbol. For Unix or Unix-like systems, leave it undefined. */ -#ifdef MINGW +#ifdef WIN32 /*MINGW*/ /* Unfortunately, there's no hiding it. */ #define HAVE_WINSOCK 1 @@ -74,7 +74,7 @@ short events; /* requested events */ short revents; /* returned events */ }; -#define poll(x, y, z) mingw_poll(x, y, z) +#define poll(x, y, z) win32_poll(x, y, z) /* These wrappers do nothing special except set the global errno variable if * an error occurs (winsock doesn't do this by default). They set errno @@ -82,17 +82,17 @@ * outside of this file "shouldn't" have to worry about winsock specific error * handling. */ -#define socket(x, y, z) mingw_socket(x, y, z) -#define connect(x, y, z) mingw_connect(x, y, z) -#define accept(x, y, z) mingw_accept(x, y, z) -#define shutdown(x, y) mingw_shutdown(x, y) -#define getpeername(x, y, z) mingw_getpeername(x, y, z) +#define socket(x, y, z) win32_socket(x, y, z) +#define connect(x, y, z) win32_connect(x, y, z) +#define accept(x, y, z) win32_accept(x, y, z) +#define shutdown(x, y) win32_shutdown(x, y) +#define getpeername(x, y, z) win32_getpeername(x, y, z) /* Wrapper macros to call misc. functions mingw is missing */ -#define sleep(x) mingw_sleep(x) -#define inet_aton(x, y) mingw_inet_aton(x, y) -#define gettimeofday(x, y) mingw_gettimeofday(x, y) -#define stat(x, y) mingw_stat(x, y) +#define sleep(x) win32_sleep(x) +#define inet_aton(x, y) win32_inet_aton(x, y) +#define gettimeofday(x, y) win32_gettimeofday(x, y) +#define stat(x, y) win32_stat(x, y) #define mkdir(x, y) mkdir(x) @@ -100,27 +100,27 @@ typedef int socklen_t; /* Function prototypes for functions in mingw.c */ -unsigned int mingw_sleep(unsigned int); -int mingw_inet_aton(const char *, struct in_addr *); -int mingw_gettimeofday(struct timeval *, char *); -int mingw_poll(struct pollfd *, unsigned int, int); -SOCKET mingw_socket(int, int, int); -int mingw_connect(SOCKET, struct sockaddr*, socklen_t); -SOCKET mingw_accept(SOCKET, struct sockaddr*, socklen_t *); -int mingw_shutdown(SOCKET, int); -int mingw_getpeername(SOCKET, struct sockaddr*, socklen_t *); +unsigned int win32_sleep(unsigned int); +int win32_inet_aton(const char *, struct in_addr *); +int win32_gettimeofday(struct timeval *, char *); +int win32_poll(struct pollfd *, unsigned int, int); +SOCKET win32_socket(int, int, int); +int win32_connect(SOCKET, struct sockaddr*, socklen_t); +SOCKET win32_accept(SOCKET, struct sockaddr*, socklen_t *); +int win32_shutdown(SOCKET, int); +int win32_getpeername(SOCKET, struct sockaddr*, socklen_t *); /* Three socket specific macros */ -#define READ(x, y, z) mingw_read_socket(x, y, z) -#define WRITE(x, y, z) mingw_write_socket(x, y, z) -#define CLOSE(x) mingw_close_socket(x) - -int mingw_read_socket(SOCKET, void *, int); -int mingw_write_socket(SOCKET, void *, int); -int mingw_close_socket(SOCKET); +#define READ(x, y, z) win32_read_socket(x, y, z) +#define WRITE(x, y, z) win32_write_socket(x, y, z) +#define CLOSE(x) win32_close_socket(x) + +int win32_read_socket(SOCKET, void *, int); +int win32_write_socket(SOCKET, void *, int); +int win32_close_socket(SOCKET); -int mingw_setnonblocking(SOCKET, int); -int mingw_stat(const char*, struct stat*); +int win32_setnonblocking(SOCKET, int); +int win32_stat(const char*, struct stat*); #endif #ifndef HAVE_READV_WRITEV diff -ruNa polipo-harden-test/object.c polipoo/object.c --- polipo-harden-test/object.c 2009-12-12 07:39:48 +0800 +++ polipoo/object.c 2010-01-22 14:46:52 +0800 @@ -809,7 +809,7 @@ discardObjects(int all, int force) { ObjectPtr object; - int i; + int i=0; static int in_discardObjects = 0; TimeEventHandlerPtr event; @@ -838,7 +838,7 @@ dispose_chunk(object->chunks[j].data); object->chunks[j].data = NULL; object->chunks[j].size = 0; - i++; + /** i++; jiang :it seems no use here */ } } object = object->previous; diff -ruNa polipo-harden-test/polipo.h polipoo/polipo.h --- polipo-harden-test/polipo.h 2009-12-12 07:39:48 +0800 +++ polipoo/polipo.h 2010-01-22 14:49:35 +0800 @@ -24,7 +24,9 @@ #define _GNU_SOURCE #endif +#ifndef WIN32 #include +#endif #ifdef __MINGW32_VERSION #define MINGW @@ -37,13 +39,15 @@ #include #include #include -#include #include #include -#include #include +#ifndef _MSC_VER +#include +#include #include -#ifndef MINGW +#endif +#ifndef WIN32 /*MINGW*/ #include #include #include @@ -58,6 +62,14 @@ #include #endif +#if defined(va_copy) +#elif defined(__va_copy) +# define va_copy(dst, src) __va_copy((dst), (src)) +#else +/* # define va_copy(dst, src) (memcpy(&(dst), &(src), sizeof (va_list))) */ +# define va_copy(dst, src) do{((dst) = (src)) ;} while(0) +#endif + #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif @@ -165,7 +177,7 @@ #define UNALIGNED_ACCESS #endif -#ifndef MINGW +#ifndef WIN32 /*MINGW*/ #define HAVE_FORK #ifndef NO_SYSLOG #define HAVE_SYSLOG @@ -181,6 +193,15 @@ #endif #endif +#ifdef _MSC_VER + +#define F_OK 00 +#define snprintf _snprintf +#define S_ISDIR(x) (S_IFDIR&(x)) +#define S_ISREG(x) (S_IFREG&(x)) + +#endif + #ifdef HAVE_READV_WRITEV #define WRITEV(x, y, z) writev(x, y, z) #define READV(x, y, z) readv(x, y, z) diff -ruNa polipo-harden-test/polipo.vcproj polipoo/polipo.vcproj --- polipo-harden-test/polipo.vcproj 1970-01-01 08:00:00 +0800 +++ polipoo/polipo.vcproj 2010-01-22 18:36:00 +0800 @@ -0,0 +1,391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruNa polipo-harden-test/polipo.vcxproj polipoo/polipo.vcxproj --- polipo-harden-test/polipo.vcxproj 1970-01-01 08:00:00 +0800 +++ polipoo/polipo.vcxproj 2010-01-22 15:05:16 +0800 @@ -0,0 +1,138 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B4E72DB8-4BA8-44D9-83F4-84162140CC91} + polipo + + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + WIN32;HAS_INTTYPES_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + + + ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + true + MachineX86 + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + WIN32;HAS_INTTYPES_H;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + + + ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + true + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ruNa polipo-harden-test/util.c polipoo/util.c --- polipo-harden-test/util.c 2009-12-12 07:39:48 +0800 +++ polipoo/util.c 2010-01-22 18:22:50 +0800 @@ -278,11 +278,13 @@ #else -/* This is not going to work if va_list is interesting. But then, if you +/*** This is not going to work if va_list is interesting. But then, if you have a non-trivial implementation of va_list, you should have va_copy. */ +/* #ifndef va_copy #define va_copy(a, b) do { a = b; } while(0) -#endif +#endif +*/ char* vsprintf_a(const char *f, va_list args) @@ -392,7 +394,7 @@ default: s = NULL; break; } if(!s) s = strerror(e); -#ifdef MINGW +#ifdef WIN32 /*MINGW*/ if(!s) { if(e >= WSABASEERR && e <= WSABASEERR + 2000) { /* This should be okay, as long as the caller discards the @@ -451,12 +453,29 @@ tzset(); return t; } +#elif defined(_MSC_VER) + time_t +mktime_gmt(struct tm *tm) +{ + time_t t; + static int bias = -1; + if(bias == -1) + { + time_t curr = time(NULL); + struct tm * p = gmtime(&curr); + time_t gmtcurr = mktime(p); + bias = curr-gmtcurr ; + } + t = mktime(tm)+bias; + /* printf("mktime_gmt2: %d\n", t ); */ + return t; +} #else time_t mktime_gmt(struct tm *tm) { time_t t; - char *tz; + char *tz=NULL; static char *old_tz = NULL; tz = getenv("TZ"); @@ -466,6 +485,7 @@ if(old_tz) free(old_tz); if(tz) + /* if( tz && tz[0]>0 ) */ old_tz = sprintf_a("TZ=%s", tz); else old_tz = strdup("TZ"); /* XXX - non-portable? */