Index: lib/libcvs.dsp =================================================================== RCS file: /cvsroot/cvs/ccvs/lib/libcvs.dsp,v retrieving revision 1.28 diff -u -p -r1.28 libcvs.dsp --- lib/libcvs.dsp 20 Sep 2005 17:00:03 -0000 1.28 +++ lib/libcvs.dsp 22 Sep 2005 22:57:45 -0000 @@ -205,6 +205,10 @@ SOURCE=.\mempcpy.c # End Source File # Begin Source File +SOURCE=.\mkstemp.c +# End Source File +# Begin Source File + SOURCE=.\pagealign_alloc.c # End Source File # Begin Source File @@ -262,6 +266,10 @@ SOURCE=.\stripslash.c # Begin Source File SOURCE=.\strnlen1.c +# End Source File +# Begin Source File + +SOURCE=.\tempname.c # End Source File # Begin Source File Index: windows-NT/config.h =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h,v retrieving revision 1.165 diff -u -p -r1.165 config.h --- windows-NT/config.h 20 Sep 2005 02:49:54 -0000 1.165 +++ windows-NT/config.h 22 Sep 2005 22:57:46 -0000 @@ -137,7 +137,7 @@ #define HAVE_ALLOCA_H 1 /* Define to 1 if you have the `atexit' function. */ -#undef HAVE_ATEXIT +#define HAVE_ATEXIT 1 /* Define to 1 if you have the header file. */ #undef HAVE_BP_SYM_H @@ -237,7 +237,7 @@ /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ -#undef HAVE_DECL_GETENV +#define HAVE_DECL_GETENV 1 /* Define to 1 if you have the declaration of `getline', and to 0 if you don't. */ @@ -284,20 +284,20 @@ #define HAVE_DECL___FPENDING 0 /* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 +#undef HAVE_DIRECT_H /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `dup2' function. */ -#undef HAVE_DUP2 +#define HAVE_DUP2 1 /* Define if you have the declaration of environ. */ -#undef HAVE_ENVIRON_DECL +#define HAVE_ENVIRON_DECL 1 /* Define if you have the declaration of errno. */ -#undef HAVE_ERRNO_DECL +#define HAVE_ERRNO_DECL 1 /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -345,7 +345,7 @@ #undef HAVE_GETGROUPS /* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME +#define HAVE_GETHOSTNAME 1 /* Define to 1 if you have the `getlogin_r' function. */ #undef HAVE_GETLOGIN_R @@ -406,13 +406,13 @@ #define HAVE_IO_H 1 /* Define to 1 if defines AF_INET. */ -#undef HAVE_IPV4 +#define HAVE_IPV4 1 /* Define to 1 if defines AF_INET6. */ #undef HAVE_IPV6 /* Define to 1 if you have the `isascii' function. */ -#undef HAVE_ISASCII +#define HAVE_ISASCII 1 /* Define to 1 if you have the `isblank' function. */ #undef HAVE_ISBLANK @@ -442,7 +442,7 @@ #undef HAVE_LIBNSL /* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H +#define HAVE_LOCALE_H 1 /* Define to 1 if you have the `login' function. */ #undef HAVE_LOGIN @@ -468,10 +468,10 @@ #undef HAVE_MAP_ANONYMOUS /* Define to 1 if you have the `mblen' function. */ -#undef HAVE_MBLEN +#define HAVE_MBLEN 1 /* Define to 1 if you have the `mbrlen' function. */ -#undef HAVE_MBRLEN +#define HAVE_MBRLEN 1 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -480,16 +480,16 @@ #undef HAVE_MBSINIT /* Define to 1 if you have the `mbsrtowcs' function. */ -#undef HAVE_MBSRTOWCS +#define HAVE_MBSRTOWCS 1 /* Define to 1 if declares mbstate_t. */ -#undef HAVE_MBSTATE_T +#define HAVE_MBSTATE_T 1 /* Define if you have memchr (always for CVS). */ -#undef HAVE_MEMCHR +#define HAVE_MEMCHR 1 /* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE +#define HAVE_MEMMOVE 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -552,14 +552,14 @@ #define HAVE_PRINTF_PTR 1 /* Define to 1 if the system has the type `ptrdiff_t'. */ -#undef HAVE_PTRDIFF_T +#define HAVE_PTRDIFF_T 1 /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ -#define HAVE_REALLOC 1 +#undef HAVE_REALLOC /* Define to 1 if you have the `regcomp' function. */ #undef HAVE_REGCOMP @@ -583,7 +583,7 @@ #define HAVE_RUN_TZSET_TEST 1 /* Define to 1 if you have the header file. */ -#undef HAVE_SEARCH_H +#define HAVE_SEARCH_H 1 /* Define to 1 if security/pam_appl.h is available */ #undef HAVE_SECURITY_PAM_APPL_H @@ -632,7 +632,7 @@ #define HAVE_STDLIB_H 1 /* Define if you have strchr (always for CVS). */ -#undef HAVE_STRCHR +#define HAVE_STRCHR 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -659,7 +659,7 @@ #define HAVE_STRTOL 1 /* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL +#define HAVE_STRTOUL 1 /* Define if there is a member named d_type in the struct describing directory headers. */ @@ -669,7 +669,7 @@ #undef HAVE_STRUCT_STAT_ST_BLKSIZE /* Define to 1 if `st_rdev' is member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_RDEV +#define HAVE_STRUCT_STAT_ST_RDEV 1 /* Define if struct timespec is declared in . */ #undef HAVE_STRUCT_TIMESPEC @@ -749,10 +749,10 @@ /* Define to 1 if you don't have `tm_zone' but do have the external array `tzname'. */ -#undef HAVE_TZNAME +#define HAVE_TZNAME 1 /* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET +#define HAVE_TZSET 1 /* Define if you have the 'uintmax_t' type in or . */ #undef HAVE_UINTMAX_T @@ -803,25 +803,25 @@ #define HAVE_WCHAR_T 1 /* Define to 1 if you have the `wcrtomb' function. */ -#undef HAVE_WCRTOMB +#define HAVE_WCRTOMB 1 /* Define to 1 if you have the `wcscoll' function. */ -#undef HAVE_WCSCOLL +#define HAVE_WCSCOLL 1 /* Define to 1 if you have the `wcslen' function. */ -#undef HAVE_WCSLEN +#define HAVE_WCSLEN 1 /* Define to 1 if you have the header file. */ -#undef HAVE_WCTYPE_H +#define HAVE_WCTYPE_H 1 /* Define if you have the 'wint_t' type. */ -#undef HAVE_WINT_T +#define HAVE_WINT_T 1 /* Define to 1 if you have the `wmemchr' function. */ -#undef HAVE_WMEMCHR +#define HAVE_WMEMCHR 1 /* Define to 1 if you have the `wmemcpy' function. */ -#undef HAVE_WMEMCPY +#define HAVE_WMEMCPY 1 /* Define to 1 if you have the `wmempcpy' function. */ #undef HAVE_WMEMPCPY @@ -956,40 +956,40 @@ #undef SERVER_SUPPORT /* The size of a `char', as computed by sizeof. */ -#undef SIZEOF_CHAR +#define SIZEOF_CHAR 1 /* The size of a `double', as computed by sizeof. */ -#undef SIZEOF_DOUBLE +#define SIZEOF_DOUBLE 8 /* The size of a `float', as computed by sizeof. */ -#undef SIZEOF_FLOAT +#define SIZEOF_FLOAT 4 /* The size of a `int', as computed by sizeof. */ -#undef SIZEOF_INT +#define SIZEOF_INT 4 /* The size of a `intmax_t', as computed by sizeof. */ #undef SIZEOF_INTMAX_T /* The size of a `long', as computed by sizeof. */ -#undef SIZEOF_LONG +#define SIZEOF_LONG 4 /* The size of a `long double', as computed by sizeof. */ -#undef SIZEOF_LONG_DOUBLE +#define SIZEOF_LONG_DOUBLE 8 /* The size of a `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG /* The size of a `ptrdiff_t', as computed by sizeof. */ -#undef SIZEOF_PTRDIFF_T +#define SIZEOF_PTRDIFF_T 4 /* The size of a `short', as computed by sizeof. */ -#undef SIZEOF_SHORT +#define SIZEOF_SHORT 2 /* The size of a `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T +#define SIZEOF_SIZE_T 4 /* The size of a `wint_t', as computed by sizeof. */ -#undef SIZEOF_WINT_T +#define SIZEOF_WINT_T 2 /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ @@ -1246,7 +1246,7 @@ #define ssize_t int /* Define to rpl_strcasecmp always. */ -#undef strcasecmp +#define strcasecmp rpl_strcasecmp /* Define to rpl_tzset if the wrapper function should be used. */ #undef tzset @@ -1281,6 +1281,11 @@ Reorgnized by Conrad T. Pino May 25, 2005 */ +/* just one time please */ +#ifdef _MSC_VER +#pragma once +#endif + /* ======================= Macro Definnitions Follow ====================== */ /* Under Windows NT, mkdir only takes one argument. */ @@ -1294,6 +1299,10 @@ /* Windows has no ELOOP value in errno.h */ #define ELOOP EMLINK +/* Windows has _snprintf function. + HAVE_DECL__SNPRINTF used in ../lib/vasnprintf.c */ +#define HAVE_DECL__SNPRINTF 1 + #define HAVE_WINSOCK_H /* This tells the client that it must use send()/recv() to talk to the @@ -1301,6 +1310,12 @@ it because _open_osfhandle doesn't work. */ #define NO_SOCKET_TO_FD 1 +/* Is this true on NT? Seems like I remember reports that NT 3.51 has + problems with 200K writes (of course, the issue of large writes is + moot since the use of buffer.c ensures that writes will only be as big + as the buffers). */ +#define SEND_NEVER_PARTIAL 1 + /* Stop server macro */ #define SHUTDOWN_SERVER wnt_shutdown_server @@ -1331,11 +1346,21 @@ /* Macro name tells the story */ #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() -/* Is this true on NT? Seems like I remember reports that NT 3.51 has - problems with 200K writes (of course, the issue of large writes is - moot since the use of buffer.c ensures that writes will only be as big - as the buffers). */ -#define SEND_NEVER_PARTIAL 1 +/* + * According to GNU conventions, we should avoid referencing any macro + * containing "WIN" as a reference to Microsoft Windows, as we would like to + * avoid any implication that we consider Microsoft Windows any sort of "win". + * + * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing + * defining a configure macro to define WOE32 appropriately. If they ever do + * write such a beast, we should use it, though in most cases it would be + * preferable to avoid referencing any OS or compiler anyhow, per Autoconf + * convention, and reference only tested features of the system. + * + * re FIXME: This definition would still be necessary since systems which run + * configure do not use this config.h and vice-versa. + */ +#define WOE32 1 /* Define POSIX name to Microsoft name */ #define dup _dup @@ -1349,12 +1374,18 @@ /* Define POSIX name to Microsoft name */ #define pclose _pclose +/* Define to a substitute for the `lstat' function. */ +#define lstat stat + /* Diff needs us to define this. I think it could always be -1 for CVS, because we pass temporary files to diff, but config.h seems like the easiest place to put this, so for now we put it here. */ #define same_file(s,t) (-1) +/* Define to a substitute for the stat function. */ +#define stat wnt_stat + /* ====================== Typedef Declarations Follow ===================== */ /* ====================== Function Prototypes Follow ====================== */ @@ -1383,24 +1414,16 @@ void wnt_start_server (int *tofd, int *f /* #define stat wnt_stat and #define lstat wnt_stat */ int wnt_stat (const char *file, struct wnt_stat *sb); -/* Define to a substitute for the `lstat' function. */ -#define lstat stat +/* =============== Special mkdir Prototype Handling Follows =============== */ -/* Define to a substitute for the stat function. */ -#define stat wnt_stat +#include +#define mkdir wnt_mkdir -/* - * According to GNU conventions, we should avoid referencing any macro - * containing "WIN" as a reference to Microsoft Windows, as we would like to - * avoid any implication that we consider Microsoft Windows any sort of "win". - * - * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing - * defining a configure macro to define WOE32 appropriately. If they ever do - * write such a beast, we should use it, though in most cases it would be - * preferable to avoid referencing any OS or compiler anyhow, per Autoconf - * convention, and reference only tested features of the system. - * - * re FIXME: This definition would still be necessary since systems which run - * configure do not use this config.h and vice-versa. - */ -#define WOE32 1 +/* ===================== Special Function Definitions ===================== */ + +/* If Visual C++ 6.0 */ +#if _MSC_VER == 1200 +static inline int mbsinit( const void * arg ) { return 1; } +#endif + +/* =========================== End Of This File =========================== */ Index: windows-NT/config.h.in =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in,v retrieving revision 1.95 diff -u -p -r1.95 config.h.in --- windows-NT/config.h.in 20 Sep 2005 02:49:54 -0000 1.95 +++ windows-NT/config.h.in 22 Sep 2005 22:57:46 -0000 @@ -130,7 +130,7 @@ #define HAVE_ALLOCA_H 1 /* Define to 1 if you have the `atexit' function. */ -#undef HAVE_ATEXIT +#define HAVE_ATEXIT 1 /* Define to 1 if you have the header file. */ #undef HAVE_BP_SYM_H @@ -230,7 +230,7 @@ /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ -#undef HAVE_DECL_GETENV +#define HAVE_DECL_GETENV 1 /* Define to 1 if you have the declaration of `getline', and to 0 if you don't. */ @@ -277,20 +277,20 @@ #define HAVE_DECL___FPENDING 0 /* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 +#undef HAVE_DIRECT_H /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `dup2' function. */ -#undef HAVE_DUP2 +#define HAVE_DUP2 1 /* Define if you have the declaration of environ. */ -#undef HAVE_ENVIRON_DECL +#define HAVE_ENVIRON_DECL 1 /* Define if you have the declaration of errno. */ -#undef HAVE_ERRNO_DECL +#define HAVE_ERRNO_DECL 1 /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -338,7 +338,7 @@ #undef HAVE_GETGROUPS /* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME +#define HAVE_GETHOSTNAME 1 /* Define to 1 if you have the `getlogin_r' function. */ #undef HAVE_GETLOGIN_R @@ -399,13 +399,13 @@ #define HAVE_IO_H 1 /* Define to 1 if defines AF_INET. */ -#undef HAVE_IPV4 +#define HAVE_IPV4 1 /* Define to 1 if defines AF_INET6. */ #undef HAVE_IPV6 /* Define to 1 if you have the `isascii' function. */ -#undef HAVE_ISASCII +#define HAVE_ISASCII 1 /* Define to 1 if you have the `isblank' function. */ #undef HAVE_ISBLANK @@ -435,7 +435,7 @@ #undef HAVE_LIBNSL /* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H +#define HAVE_LOCALE_H 1 /* Define to 1 if you have the `login' function. */ #undef HAVE_LOGIN @@ -461,10 +461,10 @@ #undef HAVE_MAP_ANONYMOUS /* Define to 1 if you have the `mblen' function. */ -#undef HAVE_MBLEN +#define HAVE_MBLEN 1 /* Define to 1 if you have the `mbrlen' function. */ -#undef HAVE_MBRLEN +#define HAVE_MBRLEN 1 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -473,16 +473,16 @@ #undef HAVE_MBSINIT /* Define to 1 if you have the `mbsrtowcs' function. */ -#undef HAVE_MBSRTOWCS +#define HAVE_MBSRTOWCS 1 /* Define to 1 if declares mbstate_t. */ -#undef HAVE_MBSTATE_T +#define HAVE_MBSTATE_T 1 /* Define if you have memchr (always for CVS). */ -#undef HAVE_MEMCHR +#define HAVE_MEMCHR 1 /* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE +#define HAVE_MEMMOVE 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -545,14 +545,14 @@ #define HAVE_PRINTF_PTR 1 /* Define to 1 if the system has the type `ptrdiff_t'. */ -#undef HAVE_PTRDIFF_T +#define HAVE_PTRDIFF_T 1 /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ -#define HAVE_REALLOC 1 +#undef HAVE_REALLOC /* Define to 1 if you have the `regcomp' function. */ #undef HAVE_REGCOMP @@ -576,7 +576,7 @@ #define HAVE_RUN_TZSET_TEST 1 /* Define to 1 if you have the header file. */ -#undef HAVE_SEARCH_H +#define HAVE_SEARCH_H 1 /* Define to 1 if security/pam_appl.h is available */ #undef HAVE_SECURITY_PAM_APPL_H @@ -625,7 +625,7 @@ #define HAVE_STDLIB_H 1 /* Define if you have strchr (always for CVS). */ -#undef HAVE_STRCHR +#define HAVE_STRCHR 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -652,7 +652,7 @@ #define HAVE_STRTOL 1 /* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL +#define HAVE_STRTOUL 1 /* Define if there is a member named d_type in the struct describing directory headers. */ @@ -662,7 +662,7 @@ #undef HAVE_STRUCT_STAT_ST_BLKSIZE /* Define to 1 if `st_rdev' is member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_RDEV +#define HAVE_STRUCT_STAT_ST_RDEV 1 /* Define if struct timespec is declared in . */ #undef HAVE_STRUCT_TIMESPEC @@ -742,10 +742,10 @@ /* Define to 1 if you don't have `tm_zone' but do have the external array `tzname'. */ -#undef HAVE_TZNAME +#define HAVE_TZNAME 1 /* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET +#define HAVE_TZSET 1 /* Define if you have the 'uintmax_t' type in or . */ #undef HAVE_UINTMAX_T @@ -796,25 +796,25 @@ #define HAVE_WCHAR_T 1 /* Define to 1 if you have the `wcrtomb' function. */ -#undef HAVE_WCRTOMB +#define HAVE_WCRTOMB 1 /* Define to 1 if you have the `wcscoll' function. */ -#undef HAVE_WCSCOLL +#define HAVE_WCSCOLL 1 /* Define to 1 if you have the `wcslen' function. */ -#undef HAVE_WCSLEN +#define HAVE_WCSLEN 1 /* Define to 1 if you have the header file. */ -#undef HAVE_WCTYPE_H +#define HAVE_WCTYPE_H 1 /* Define if you have the 'wint_t' type. */ -#undef HAVE_WINT_T +#define HAVE_WINT_T 1 /* Define to 1 if you have the `wmemchr' function. */ -#undef HAVE_WMEMCHR +#define HAVE_WMEMCHR 1 /* Define to 1 if you have the `wmemcpy' function. */ -#undef HAVE_WMEMCPY +#define HAVE_WMEMCPY 1 /* Define to 1 if you have the `wmempcpy' function. */ #undef HAVE_WMEMPCPY @@ -949,40 +949,40 @@ #undef SERVER_SUPPORT /* The size of a `char', as computed by sizeof. */ -#undef SIZEOF_CHAR +#define SIZEOF_CHAR 1 /* The size of a `double', as computed by sizeof. */ -#undef SIZEOF_DOUBLE +#define SIZEOF_DOUBLE 8 /* The size of a `float', as computed by sizeof. */ -#undef SIZEOF_FLOAT +#define SIZEOF_FLOAT 4 /* The size of a `int', as computed by sizeof. */ -#undef SIZEOF_INT +#define SIZEOF_INT 4 /* The size of a `intmax_t', as computed by sizeof. */ #undef SIZEOF_INTMAX_T /* The size of a `long', as computed by sizeof. */ -#undef SIZEOF_LONG +#define SIZEOF_LONG 4 /* The size of a `long double', as computed by sizeof. */ -#undef SIZEOF_LONG_DOUBLE +#define SIZEOF_LONG_DOUBLE 8 /* The size of a `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG /* The size of a `ptrdiff_t', as computed by sizeof. */ -#undef SIZEOF_PTRDIFF_T +#define SIZEOF_PTRDIFF_T 4 /* The size of a `short', as computed by sizeof. */ -#undef SIZEOF_SHORT +#define SIZEOF_SHORT 2 /* The size of a `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T +#define SIZEOF_SIZE_T 4 /* The size of a `wint_t', as computed by sizeof. */ -#undef SIZEOF_WINT_T +#define SIZEOF_WINT_T 2 /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ @@ -1239,7 +1239,7 @@ #define ssize_t int /* Define to rpl_strcasecmp always. */ -#undef strcasecmp +#define strcasecmp rpl_strcasecmp /* Define to rpl_tzset if the wrapper function should be used. */ #undef tzset @@ -1274,6 +1274,11 @@ Reorgnized by Conrad T. Pino May 25, 2005 */ +/* just one time please */ +#ifdef _MSC_VER +#pragma once +#endif + /* ======================= Macro Definnitions Follow ====================== */ /* Under Windows NT, mkdir only takes one argument. */ @@ -1287,6 +1292,10 @@ /* Windows has no ELOOP value in errno.h */ #define ELOOP EMLINK +/* Windows has _snprintf function. + HAVE_DECL__SNPRINTF used in ../lib/vasnprintf.c */ +#define HAVE_DECL__SNPRINTF 1 + #define HAVE_WINSOCK_H /* This tells the client that it must use send()/recv() to talk to the @@ -1294,6 +1303,12 @@ it because _open_osfhandle doesn't work. */ #define NO_SOCKET_TO_FD 1 +/* Is this true on NT? Seems like I remember reports that NT 3.51 has + problems with 200K writes (of course, the issue of large writes is + moot since the use of buffer.c ensures that writes will only be as big + as the buffers). */ +#define SEND_NEVER_PARTIAL 1 + /* Stop server macro */ #define SHUTDOWN_SERVER wnt_shutdown_server @@ -1324,11 +1339,21 @@ /* Macro name tells the story */ #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() -/* Is this true on NT? Seems like I remember reports that NT 3.51 has - problems with 200K writes (of course, the issue of large writes is - moot since the use of buffer.c ensures that writes will only be as big - as the buffers). */ -#define SEND_NEVER_PARTIAL 1 +/* + * According to GNU conventions, we should avoid referencing any macro + * containing "WIN" as a reference to Microsoft Windows, as we would like to + * avoid any implication that we consider Microsoft Windows any sort of "win". + * + * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing + * defining a configure macro to define WOE32 appropriately. If they ever do + * write such a beast, we should use it, though in most cases it would be + * preferable to avoid referencing any OS or compiler anyhow, per Autoconf + * convention, and reference only tested features of the system. + * + * re FIXME: This definition would still be necessary since systems which run + * configure do not use this config.h and vice-versa. + */ +#define WOE32 1 /* Define POSIX name to Microsoft name */ #define dup _dup @@ -1342,12 +1367,18 @@ /* Define POSIX name to Microsoft name */ #define pclose _pclose +/* Define to a substitute for the `lstat' function. */ +#define lstat stat + /* Diff needs us to define this. I think it could always be -1 for CVS, because we pass temporary files to diff, but config.h seems like the easiest place to put this, so for now we put it here. */ #define same_file(s,t) (-1) +/* Define to a substitute for the stat function. */ +#define stat wnt_stat + /* ====================== Typedef Declarations Follow ===================== */ /* ====================== Function Prototypes Follow ====================== */ @@ -1376,24 +1407,16 @@ void wnt_start_server (int *tofd, int *f /* #define stat wnt_stat and #define lstat wnt_stat */ int wnt_stat (const char *file, struct wnt_stat *sb); -/* Define to a substitute for the `lstat' function. */ -#define lstat stat +/* =============== Special mkdir Prototype Handling Follows =============== */ -/* Define to a substitute for the stat function. */ -#define stat wnt_stat +#include +#define mkdir wnt_mkdir -/* - * According to GNU conventions, we should avoid referencing any macro - * containing "WIN" as a reference to Microsoft Windows, as we would like to - * avoid any implication that we consider Microsoft Windows any sort of "win". - * - * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing - * defining a configure macro to define WOE32 appropriately. If they ever do - * write such a beast, we should use it, though in most cases it would be - * preferable to avoid referencing any OS or compiler anyhow, per Autoconf - * convention, and reference only tested features of the system. - * - * re FIXME: This definition would still be necessary since systems which run - * configure do not use this config.h and vice-versa. - */ -#define WOE32 1 +/* ===================== Special Function Definitions ===================== */ + +/* If Visual C++ 6.0 */ +#if _MSC_VER == 1200 +static inline int mbsinit( const void * arg ) { return 1; } +#endif + +/* =========================== End Of This File =========================== */ Index: windows-NT/config.h.in.footer =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in.footer,v retrieving revision 1.9 diff -u -p -r1.9 config.h.in.footer --- windows-NT/config.h.in.footer 12 Jul 2005 13:44:29 -0000 1.9 +++ windows-NT/config.h.in.footer 22 Sep 2005 22:57:46 -0000 @@ -15,6 +15,11 @@ Reorgnized by Conrad T. Pino May 25, 2005 */ +/* just one time please */ +#ifdef _MSC_VER +#pragma once +#endif + /* ======================= Macro Definnitions Follow ====================== */ /* Under Windows NT, mkdir only takes one argument. */ @@ -28,6 +33,10 @@ /* Windows has no ELOOP value in errno.h */ #define ELOOP EMLINK +/* Windows has _snprintf function. + HAVE_DECL__SNPRINTF used in ../lib/vasnprintf.c */ +#define HAVE_DECL__SNPRINTF 1 + #define HAVE_WINSOCK_H /* This tells the client that it must use send()/recv() to talk to the @@ -35,6 +44,12 @@ it because _open_osfhandle doesn't work. */ #define NO_SOCKET_TO_FD 1 +/* Is this true on NT? Seems like I remember reports that NT 3.51 has + problems with 200K writes (of course, the issue of large writes is + moot since the use of buffer.c ensures that writes will only be as big + as the buffers). */ +#define SEND_NEVER_PARTIAL 1 + /* Stop server macro */ #define SHUTDOWN_SERVER wnt_shutdown_server @@ -65,11 +80,21 @@ /* Macro name tells the story */ #define SYSTEM_INITIALIZE(pargc,pargv) woe32_init_winsock() -/* Is this true on NT? Seems like I remember reports that NT 3.51 has - problems with 200K writes (of course, the issue of large writes is - moot since the use of buffer.c ensures that writes will only be as big - as the buffers). */ -#define SEND_NEVER_PARTIAL 1 +/* + * According to GNU conventions, we should avoid referencing any macro + * containing "WIN" as a reference to Microsoft Windows, as we would like to + * avoid any implication that we consider Microsoft Windows any sort of "win". + * + * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing + * defining a configure macro to define WOE32 appropriately. If they ever do + * write such a beast, we should use it, though in most cases it would be + * preferable to avoid referencing any OS or compiler anyhow, per Autoconf + * convention, and reference only tested features of the system. + * + * re FIXME: This definition would still be necessary since systems which run + * configure do not use this config.h and vice-versa. + */ +#define WOE32 1 /* Define POSIX name to Microsoft name */ #define dup _dup @@ -83,12 +108,18 @@ /* Define POSIX name to Microsoft name */ #define pclose _pclose +/* Define to a substitute for the `lstat' function. */ +#define lstat stat + /* Diff needs us to define this. I think it could always be -1 for CVS, because we pass temporary files to diff, but config.h seems like the easiest place to put this, so for now we put it here. */ #define same_file(s,t) (-1) +/* Define to a substitute for the stat function. */ +#define stat wnt_stat + /* ====================== Typedef Declarations Follow ===================== */ /* ====================== Function Prototypes Follow ====================== */ @@ -117,24 +148,16 @@ void wnt_start_server (int *tofd, int *f /* #define stat wnt_stat and #define lstat wnt_stat */ int wnt_stat (const char *file, struct wnt_stat *sb); -/* Define to a substitute for the `lstat' function. */ -#define lstat stat +/* =============== Special mkdir Prototype Handling Follows =============== */ -/* Define to a substitute for the stat function. */ -#define stat wnt_stat +#include +#define mkdir wnt_mkdir -/* - * According to GNU conventions, we should avoid referencing any macro - * containing "WIN" as a reference to Microsoft Windows, as we would like to - * avoid any implication that we consider Microsoft Windows any sort of "win". - * - * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing - * defining a configure macro to define WOE32 appropriately. If they ever do - * write such a beast, we should use it, though in most cases it would be - * preferable to avoid referencing any OS or compiler anyhow, per Autoconf - * convention, and reference only tested features of the system. - * - * re FIXME: This definition would still be necessary since systems which run - * configure do not use this config.h and vice-versa. - */ -#define WOE32 1 +/* ===================== Special Function Definitions ===================== */ + +/* If Visual C++ 6.0 */ +#if _MSC_VER == 1200 +static inline int mbsinit( const void * arg ) { return 1; } +#endif + +/* =========================== End Of This File =========================== */ Index: windows-NT/config.h.in.in =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in.in,v retrieving revision 1.41 diff -u -p -r1.41 config.h.in.in --- windows-NT/config.h.in.in 20 Sep 2005 02:49:54 -0000 1.41 +++ windows-NT/config.h.in.in 22 Sep 2005 22:57:47 -0000 @@ -6,6 +6,11 @@ and use ../cvsnt.mak for your project. Thus, this is the right place to put configuration information for Windows NT. */ +/* Define this to a NULL terminated list of allowed path prefixes (for + directories) and paths to files the CVS server will allow configuration to + be read from when specified from the command line. */ +#undef ALLOW_CONFIG_OVERRIDE + /* Enable AUTH_CLIENT_SUPPORT to enable pserver as a remote access method in the CVS client (default) */ #define AUTH_CLIENT_SUPPORT 1 @@ -92,10 +97,6 @@ message to be appended to the temp file when the editor is started. */ #undef FORCE_USE_EDITOR -/* Define to rpl_ if the glob replacement functions and variables should be - used. */ -#define GLOB_PREFIX rpl_ - /* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only relevant when using GSSAPI. */ @@ -113,7 +114,10 @@ #define HAVE_ALLOCA_H 1 /* Define to 1 if you have the `atexit' function. */ -#undef HAVE_ATEXIT +#define HAVE_ATEXIT 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_BP_SYM_H /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC @@ -208,9 +212,17 @@ don't. */ #undef HAVE_DECL_GETC_UNLOCKED +/* Define to 1 if you have the declaration of `getdelim', and to 0 if you + don't. */ +#undef HAVE_DECL_GETDELIM + /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ -#undef HAVE_DECL_GETENV +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `getline', and to 0 if you + don't. */ +#undef HAVE_DECL_GETLINE /* Define to 1 if you have the declaration of `getlogin', and to 0 if you don't. */ @@ -249,20 +261,21 @@ #undef HAVE_DECL_STRERROR_R /* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 +/* Windows has but some functions aren't POSIX compliant */ +#undef HAVE_DIRECT_H /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `dup2' function. */ -#undef HAVE_DUP2 +#define HAVE_DUP2 1 /* Define if you have the declaration of environ. */ -#undef HAVE_ENVIRON_DECL +#define HAVE_ENVIRON_DECL 1 /* Define if you have the declaration of errno. */ -#undef HAVE_ERRNO_DECL +#define HAVE_ERRNO_DECL 1 /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -273,6 +286,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if you have the `flockfile' function. */ +#undef HAVE_FLOCKFILE + /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -288,6 +304,15 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE +/* Define to 1 if you have the `funlockfile' function. */ +#undef HAVE_FUNLOCKFILE + +/* Define to 1 if you have the `gai_strerror' function. */ +#undef HAVE_GAI_STRERROR + +/* Define to 1 if you have the `getaddrinfo' function. */ +#undef HAVE_GETADDRINFO + /* Define to 1 if you have the `getdelim' function. */ #undef HAVE_GETDELIM @@ -298,7 +323,7 @@ #undef HAVE_GETGROUPS /* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME +#define HAVE_GETHOSTNAME 1 /* Define to 1 if you have the `getlogin_r' function. */ #undef HAVE_GETLOGIN_R @@ -339,9 +364,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GSSAPI_H -/* Define if you have the hstrerror function. */ -#undef HAVE_HSTRERROR - /* Define if you have the iconv() function. */ #undef HAVE_ICONV @@ -361,8 +383,17 @@ /* Define to 1 if you have the header file. */ #define HAVE_IO_H 1 +/* Define to 1 if defines AF_INET. */ +#define HAVE_IPV4 1 + +/* Define to 1 if defines AF_INET6. */ +#undef HAVE_IPV6 + /* Define to 1 if you have the `isascii' function. */ -#undef HAVE_ISASCII +#define HAVE_ISASCII 1 + +/* Define to 1 if you have the `isblank' function. */ +#undef HAVE_ISBLANK /* Define to 1 if you have the `iswprint' function. */ #define HAVE_ISWPRINT 1 @@ -376,6 +407,9 @@ /* Define to 1 if you have the `krb_get_err_text' function. */ #undef HAVE_KRB_GET_ERR_TEXT +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + /* Define to 1 if you have the `krb' library (-lkrb). */ #undef HAVE_LIBKRB @@ -385,6 +419,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + /* Define to 1 if you have the `login' function. */ #undef HAVE_LOGIN @@ -408,14 +445,11 @@ config.h and . */ #undef HAVE_MAP_ANONYMOUS -/* Define to `1' if is *not* available on this system. */ -#define _SYS_CDEFS_H 1 - /* Define to 1 if you have the `mblen' function. */ -#undef HAVE_MBLEN +#define HAVE_MBLEN 1 /* Define to 1 if you have the `mbrlen' function. */ -#undef HAVE_MBRLEN +#define HAVE_MBRLEN 1 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -424,16 +458,16 @@ #undef HAVE_MBSINIT /* Define to 1 if you have the `mbsrtowcs' function. */ -#undef HAVE_MBSRTOWCS +#define HAVE_MBSRTOWCS 1 /* Define to 1 if declares mbstate_t. */ -#undef HAVE_MBSTATE_T +#define HAVE_MBSTATE_T 1 /* Define if you have memchr (always for CVS). */ -#undef HAVE_MEMCHR +#define HAVE_MEMCHR 1 /* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE +#define HAVE_MEMMOVE 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -496,14 +530,14 @@ #define HAVE_PRINTF_PTR 1 /* Define to 1 if the system has the type `ptrdiff_t'. */ -#undef HAVE_PTRDIFF_T +#define HAVE_PTRDIFF_T 1 /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ -#define HAVE_REALLOC 1 +#undef HAVE_REALLOC /* Define to 1 if you have the `regcomp' function. */ #undef HAVE_REGCOMP @@ -527,7 +561,7 @@ #define HAVE_RUN_TZSET_TEST 1 /* Define to 1 if you have the header file. */ -#undef HAVE_SEARCH_H +#define HAVE_SEARCH_H 1 /* Define to 1 if security/pam_appl.h is available */ #undef HAVE_SECURITY_PAM_APPL_H @@ -575,11 +609,8 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define if you have strchr (always for CVS). */ -#undef HAVE_STRCHR +#define HAVE_STRCHR 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -602,14 +633,11 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - /* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 /* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL +#define HAVE_STRTOUL 1 /* Define if there is a member named d_type in the struct describing directory headers. */ @@ -619,7 +647,7 @@ #undef HAVE_STRUCT_STAT_ST_BLKSIZE /* Define to 1 if `st_rdev' is member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_RDEV +#define HAVE_STRUCT_STAT_ST_RDEV 1 /* Define if struct timespec is declared in . */ #undef HAVE_STRUCT_TIMESPEC @@ -671,6 +699,15 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H +/* Define to 1 if you have the `tcgetattr' function. */ +#undef HAVE_TCGETATTR + +/* Define to 1 if you have the `tcsetattr' function. */ +#undef HAVE_TCSETATTR + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIOS_H + /* Define to 1 if you have the `timezone' function. */ #undef HAVE_TIMEZONE @@ -690,10 +727,10 @@ /* Define to 1 if you don't have `tm_zone' but do have the external array `tzname'. */ -#undef HAVE_TZNAME +#define HAVE_TZNAME 1 /* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET +#define HAVE_TZSET 1 /* Define if you have the 'uintmax_t' type in or . */ #undef HAVE_UINTMAX_T @@ -743,20 +780,26 @@ /* Define if you have the 'wchar_t' type. */ #define HAVE_WCHAR_T 1 +/* Define to 1 if you have the `wcrtomb' function. */ +#define HAVE_WCRTOMB 1 + +/* Define to 1 if you have the `wcscoll' function. */ +#define HAVE_WCSCOLL 1 + /* Define to 1 if you have the `wcslen' function. */ -#undef HAVE_WCSLEN +#define HAVE_WCSLEN 1 /* Define to 1 if you have the header file. */ -#undef HAVE_WCTYPE_H +#define HAVE_WCTYPE_H 1 /* Define if you have the 'wint_t' type. */ -#undef HAVE_WINT_T +#define HAVE_WINT_T 1 /* Define to 1 if you have the `wmemchr' function. */ -#undef HAVE_WMEMCHR +#define HAVE_WMEMCHR 1 /* Define to 1 if you have the `wmemcpy' function. */ -#undef HAVE_WMEMCPY +#define HAVE_WMEMCPY 1 /* Define to 1 if you have the `wmempcpy' function. */ #undef HAVE_WMEMPCPY @@ -776,6 +819,9 @@ /* Define to 1 if you have the `__fpending' function. */ #undef HAVE___FPENDING +/* Define to 1 if you have the `__fsetlocking' function. */ +#undef HAVE___FSETLOCKING + /* Define to 1 if you have the `__secure_getenv' function. */ #undef HAVE___SECURE_GETENV @@ -882,40 +928,40 @@ #undef SERVER_SUPPORT /* The size of a `char', as computed by sizeof. */ -#undef SIZEOF_CHAR +#define SIZEOF_CHAR 1 /* The size of a `double', as computed by sizeof. */ -#undef SIZEOF_DOUBLE +#define SIZEOF_DOUBLE 8 /* The size of a `float', as computed by sizeof. */ -#undef SIZEOF_FLOAT +#define SIZEOF_FLOAT 4 /* The size of a `int', as computed by sizeof. */ -#undef SIZEOF_INT +#define SIZEOF_INT 4 /* The size of a `intmax_t', as computed by sizeof. */ #undef SIZEOF_INTMAX_T /* The size of a `long', as computed by sizeof. */ -#undef SIZEOF_LONG +#define SIZEOF_LONG 4 /* The size of a `long double', as computed by sizeof. */ -#undef SIZEOF_LONG_DOUBLE +#define SIZEOF_LONG_DOUBLE 8 /* The size of a `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG /* The size of a `ptrdiff_t', as computed by sizeof. */ -#undef SIZEOF_PTRDIFF_T +#define SIZEOF_PTRDIFF_T 4 /* The size of a `short', as computed by sizeof. */ -#undef SIZEOF_SHORT +#define SIZEOF_SHORT 2 /* The size of a `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T +#define SIZEOF_SIZE_T 4 /* The size of a `wint_t', as computed by sizeof. */ -#undef SIZEOF_WINT_T +#define SIZEOF_WINT_T 2 /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ @@ -938,10 +984,6 @@ /* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P -/* Define to be the nanoseconds member of struct stat's st_mtim, if it exists. - */ -#undef ST_MTIM_NSEC - /* Enable support for the pre 1.12.1 *info scripting hook format strings. Disable this option for a smaller executable once your scripting hooks have been updated to use the new *info format strings by passing @@ -1064,6 +1106,9 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* Define if you want regoff_t to be at least as wide POSIX requires. */ +#undef _REGEX_LARGE_OFFSETS + /* Define to force lib/regex.c to define re_comp et al. */ #define _REGEX_RE_COMP 1 @@ -1173,6 +1218,9 @@ /* Define as a signed type of the same size as size_t. */ #define ssize_t int + +/* Define to rpl_strcasecmp always. */ +#define strcasecmp rpl_strcasecmp /* Define to rpl_tzset if the wrapper function should be used. */ #undef tzset Index: windows-NT/filesubr.c =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/filesubr.c,v retrieving revision 1.60 diff -u -p -r1.60 filesubr.c --- windows-NT/filesubr.c 20 Sep 2005 05:44:53 -0000 1.60 +++ windows-NT/filesubr.c 22 Sep 2005 22:57:50 -0000 @@ -25,6 +25,8 @@ #include "JmgStat.h" +#undef mkdir + static int deep_remove_dir( const char *path ); /* Copies "from" to "to". Note that the functionality here is similar Index: windows-NT/mkdir.c =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/mkdir.c,v retrieving revision 1.4 diff -u -p -r1.4 mkdir.c --- windows-NT/mkdir.c 13 Jul 2005 17:06:36 -0000 1.4 +++ windows-NT/mkdir.c 22 Sep 2005 22:57:50 -0000 @@ -19,6 +19,8 @@ #include "cvs.h" +#undef mkdir + int wnt_mkdir (const char *path, int mode) { Index: windows-NT/unistd.h =================================================================== RCS file: /cvsroot/cvs/ccvs/windows-NT/unistd.h,v retrieving revision 1.8 diff -u -p -r1.8 unistd.h --- windows-NT/unistd.h 31 May 2005 10:19:38 -0000 1.8 +++ windows-NT/unistd.h 22 Sep 2005 22:57:50 -0000 @@ -21,8 +21,8 @@ #ifndef UNISTD_H #define UNISTD_H -/* include Microsoft's chdir, getcwd */ -#include +/* Don't include Microsoft's chdir, getcwd here, done in config.h now */ +#include /* include Microsoft's close, dup */ #include