Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline

1 files changed, 10 insertions, 10 deletions

diff --git a/contrib/cvs/src/update.c b/contrib/cvs/src/update.c
index fa75977..12f02fa 100644
--- a/contrib/cvs/src/update.c
+++ b/contrib/cvs/src/update.c
@@ -38,7 +38,7 @@
 #include "cvs.h"
 #include "savecwd.h"
 #ifdef SERVER_SUPPORT
-#include "md5.h"
+# include "md5.h"
 #endif
 #include "watch.h"
 #include "fileattr.h"
@@ -1793,7 +1793,7 @@ patch_file (finfo, vers_ts, docheckout, file_info, checksum)
 	}
 	else
 	{
-#define BINARY "Binary"
+# define BINARY "Binary"
 	    char buf[sizeof BINARY];
 	    unsigned int c;
 
@@ -2689,7 +2689,7 @@ special_file_mismatch (finfo, rev1, rev2)
 	    rev1_symlink = xreadlink (finfo->file);
 	else
 	{
-#ifdef HAVE_ST_RDEV
+# ifdef HAVE_ST_RDEV
 	    if (CVS_LSTAT (finfo->file, &sb) < 0)
 		error (1, errno, "could not get file information for %s",
 		       finfo->file);
@@ -2698,10 +2698,10 @@ special_file_mismatch (finfo, rev1, rev2)
 	    rev1_mode = sb.st_mode;
 	    if (S_ISBLK (rev1_mode) || S_ISCHR (rev1_mode))
 		rev1_dev = sb.st_rdev;
-#else
+# else
 	    error (1, 0, "cannot handle device files on this system (%s)",
 		   finfo->file);
-#endif
+# endif
 	}
 	rev1_hardlinks = list_linked_files_on_disk (finfo->file);
     }
@@ -2740,7 +2740,7 @@ special_file_mismatch (finfo, rev1, rev2)
 	    {
 		/* If the size of `ftype' changes, fix the sscanf call also */
 		char ftype[16];
-		if (sscanf (n->data, "%16s %lu", ftype,
+		if (sscanf (n->data, "%15s %lu", ftype,
 			    &dev_long) < 2)
 		    error (1, 0, "%s:%s has bad `special' newphrase %s",
 			   finfo->file, rev1, n->data);
@@ -2767,7 +2767,7 @@ special_file_mismatch (finfo, rev1, rev2)
 	    rev2_symlink = xreadlink (finfo->file);
 	else
 	{
-#ifdef HAVE_ST_RDEV
+# ifdef HAVE_ST_RDEV
 	    if (CVS_LSTAT (finfo->file, &sb) < 0)
 		error (1, errno, "could not get file information for %s",
 		       finfo->file);
@@ -2776,10 +2776,10 @@ special_file_mismatch (finfo, rev1, rev2)
 	    rev2_mode = sb.st_mode;
 	    if (S_ISBLK (rev2_mode) || S_ISCHR (rev2_mode))
 		rev2_dev = sb.st_rdev;
-#else
+# else
 	    error (1, 0, "cannot handle device files on this system (%s)",
 		   finfo->file);
-#endif
+# endif
 	}
 	rev2_hardlinks = list_linked_files_on_disk (finfo->file);
     }
@@ -2818,7 +2818,7 @@ special_file_mismatch (finfo, rev1, rev2)
 	    {
 		/* If the size of `ftype' changes, fix the sscanf call also */
 		char ftype[16];
-		if (sscanf (n->data, "%16s %lu", ftype,
+		if (sscanf (n->data, "%15s %lu", ftype,
 			    &dev_long) < 2)
 		    error (1, 0, "%s:%s has bad `special' newphrase %s",
 			   finfo->file, rev2, n->data);