Import cvs-1.11.17 onto vendor branch.

1 files changed, 39 insertions, 37 deletions

diff --git a/contrib/cvs/lib/system.h b/contrib/cvs/lib/system.h
index 4b25d31..a18dff8 100644
--- a/contrib/cvs/lib/system.h
+++ b/contrib/cvs/lib/system.h
@@ -289,7 +289,7 @@ int utime ();
 
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 char *getenv ();
 char *malloc ();
@@ -300,7 +300,7 @@ extern int errno;
 
 /* SunOS4 apparently does not define this in stdlib.h.  */
 #ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
+# define EXIT_FAILURE 1
 #endif
 
 /* check for POSIX signals */
@@ -323,26 +323,26 @@ extern int errno;
 /* Under OS/2, this must be included _after_ stdio.h; that's why we do
    it here. */
 #ifdef USE_OWN_TCPIP_H
-#include "tcpip.h"
+# include "tcpip.h"
 #endif
 
 #ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+# include <fcntl.h>
 #else
-#include <sys/file.h>
+# include <sys/file.h>
 #endif
 
 #ifndef SEEK_SET
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
+# define SEEK_SET 0
+# define SEEK_CUR 1
+# define SEEK_END 2
 #endif
 
 #ifndef F_OK
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
+# define F_OK 0
+# define X_OK 1
+# define W_OK 2
+# define R_OK 4
 #endif
 
 #if HAVE_DIRENT_H
@@ -367,7 +367,7 @@ extern int errno;
 #define convert_blocks(b, k) ((k) ? ((b) + 1) / 2 : (b))
 
 #ifndef S_ISLNK
-#define lstat stat
+# define lstat stat
 #endif
 
 /*
@@ -375,13 +375,13 @@ extern int errno;
  * because "config.h" is always included last.
  */
 #ifndef S_IWRITE
-#define	S_IWRITE	0000200		/* write permission, owner */
+# define	S_IWRITE	0000200    /* write permission, owner */
 #endif
 #ifndef S_IWGRP
-#define	S_IWGRP		0000020		/* write permission, grougroup */
+# define	S_IWGRP		0000020    /* write permission, grougroup */
 #endif
 #ifndef S_IWOTH
-#define	S_IWOTH		0000002		/* write permission, other */
+# define	S_IWOTH		0000002    /* write permission, other */
 #endif
 
 /* Under non-UNIX operating systems (MS-DOS, WinNT, MacOS), many filesystem
@@ -390,71 +390,71 @@ extern int errno;
    can hang their own definitions.  */
 
 #ifndef CVS_ACCESS
-#define CVS_ACCESS access
+# define CVS_ACCESS access
 #endif
 
 #ifndef CVS_CHDIR
-#define CVS_CHDIR chdir
+# define CVS_CHDIR chdir
 #endif
 
 #ifndef CVS_CREAT
-#define CVS_CREAT creat
+# define CVS_CREAT creat
 #endif
 
 #ifndef CVS_FOPEN
-#define CVS_FOPEN fopen
+# define CVS_FOPEN fopen
 #endif
 
 #ifndef CVS_FDOPEN
-#define CVS_FDOPEN fdopen
+# define CVS_FDOPEN fdopen
 #endif
 
 #ifndef CVS_MKDIR
-#define CVS_MKDIR mkdir
+# define CVS_MKDIR mkdir
 #endif
 
 #ifndef CVS_OPEN
-#define CVS_OPEN open
+# define CVS_OPEN open
 #endif
 
 #ifndef CVS_READDIR
-#define CVS_READDIR readdir
+# define CVS_READDIR readdir
 #endif
 
 #ifndef CVS_CLOSEDIR
-#define CVS_CLOSEDIR closedir
+# define CVS_CLOSEDIR closedir
 #endif
 
 #ifndef CVS_OPENDIR
-#define CVS_OPENDIR opendir
+# define CVS_OPENDIR opendir
 #endif
 
 #ifndef CVS_RENAME
-#define CVS_RENAME rename
+# define CVS_RENAME rename
 #endif
 
 #ifndef CVS_RMDIR
-#define CVS_RMDIR rmdir
+# define CVS_RMDIR rmdir
 #endif
 
 #ifndef CVS_STAT
-#define CVS_STAT stat
+# define CVS_STAT stat
 #endif
 
 /* Open question: should CVS_STAT be lstat by default?  We need
    to use lstat in order to handle symbolic links correctly with
    the PreservePermissions option. -twp */
 #ifndef CVS_LSTAT
-#define CVS_LSTAT lstat
+# define CVS_LSTAT lstat
 #endif
 
 #ifndef CVS_UNLINK
-#define CVS_UNLINK unlink
+# define CVS_UNLINK unlink
 #endif
 
 /* Wildcard matcher.  Should be case-insensitive if the system is.  */
 #ifndef CVS_FNMATCH
-#define CVS_FNMATCH fnmatch
+# define CVS_FNMATCH fnmatch
 #endif
 
 #ifdef WIN32
@@ -483,7 +483,7 @@ extern int errno;
 #ifdef FILENAMES_CASE_INSENSITIVE
 
 # if defined (__CYGWIN32__) || defined (WOE32)
-    /* Under Windows NT, filenames are case-insensitive, and both / and \
+    /* Under Windows, filenames are case-insensitive, and both / and \
        are path component separators.  */
 #   define FOLD_FN_CHAR(c) (WNT_filename_classes[(unsigned char) (c)])
 extern unsigned char WNT_filename_classes[];
@@ -492,12 +492,14 @@ extern unsigned char WNT_filename_classes[];
 #   define ISDIRSEP(c) (FOLD_FN_CHAR(c) == '/')
 #   define ISABSOLUTE(s) (ISDIRSEP(s[0]) || FOLD_FN_CHAR(s[0]) >= 'a' && FOLD_FN_CHAR(s[0]) <= 'z' && s[1] == ':' && ISDIRSEP(s[2]))
 # else /* ! WOE32 */
-  /* As far as I know, both Cygwin and Macintosh OS X can make it here,
+  /* As far as I know, just Macintosh OS X can make it here,
    * but since the OS X fold just folds a-z into A-Z or visa-versa, I'm just
-   * using it for Cygwin too.  The var name below could probably use a
-   * rename.
+   * allowing it to be used for any case insensitive system which we aren't
+   * yet making other specific folds or exceptions for (basically, anything
+   * case insensitive other than Windows, where \ and C:\ style absolute paths
+   * also need to be accounted for).
    *
-   * Under Mac OS X & Cygwin, filenames are case-insensitive.
+   * Under Mac OS X, filenames are case-insensitive.
    */
 #   define FOLD_FN_CHAR(c) (OSX_filename_classes[(unsigned char) (c)])
 extern unsigned char OSX_filename_classes[];