 @@ -682,27 +682,28 @@ outbuf_memory_error (struct buffer *buf)
+{
     static const char msg[] = "E Fatal server error\n\
 error ENOMEM Virtual memory exhausted.\n";
     if (command_pid > 0)
 	kill (command_pid, SIGTERM);
     /*
      * We have arranged things so that printing this now either will
      * be valid, or the "E fatal error" line will get glommed onto the
      * end of an existing "E" or "M" response.
      */
     /* If this gives an error, not much we could do.  syslog() it?  */
-    write (STDOUT_FILENO, msg, sizeof (msg) - 1);
+    if (write (STDOUT_FILENO, msg, sizeof (msg) - 1) == -1)
     	exit(EXIT_FAILURE);
 # ifdef HAVE_SYSLOG_H
     syslog (LOG_DAEMON | LOG_ERR, "virtual memory exhausted");
 # endif /* HAVE_SYSLOG_H */
     exit (EXIT_FAILURE);
+}
 static void
 input_memory_error (struct buffer *buf)
+{
     outbuf_memory_error (buf);
+}
 @@ -967,32 +968,36 @@ error ENOMEM Virtual memory exhausted.\n
 	    gzip_level = config->MinCompressionLevel;
 	    forced = true;
+	}
 	if (gzip_level > config->MaxCompressionLevel)
+	{
 	    gzip_level = config->MaxCompressionLevel;
 	    forced = true;
+	}
 	if (forced && !quiet
 	    && alloc_pending_warning (120 + strlen (program_name)))
 	    sprintf (pending_warning_text,
-"E %s server: Forcing compression level %d (allowed: %d <= z <= %d).",
+"E %s server: Forcing compression level %d (allowed: %zu <= z <= %zu).",
 		     program_name, gzip_level, config->MinCompressionLevel,
 		     config->MaxCompressionLevel);
+    }
-    if (!nolock) {
+    /* cvsacl patch */
     parse_aclconfig (current_parsed_root->directory);
     if (!nolock)
+    {
     path = xmalloc (strlen (current_parsed_root->directory)
 		   + sizeof (CVSROOTADM)
 		   + 2);
     if (path == NULL)
+    {
 	pending_error = ENOMEM;
 	return;
+    }
     (void) sprintf (path, "%s/%s", current_parsed_root->directory, CVSROOTADM);
     if (!isaccessible (path, R_OK | X_OK))
+    {
 	int save_errno = errno;
 	if (alloc_pending (80 + strlen (path)))
 @@ -4613,27 +4618,40 @@ static void
 serve_ls (char *arg)
+{
   do_cvs_command ("ls", ls);
+}
 static void
 serve_rls (char *arg)
+{
   do_cvs_command ("rls", ls);
+}
 /* cvsacl patch */
 static void
 serve_acl (char *arg)
+{
     do_cvs_command ("acl", cvsacl);
+}
 /* cvsacl patch */
 static void
 serve_racl (char *arg)
+{
     cvs_cmd_name = "racl";
     do_cvs_command ("racl", cvsacl);
+}
 static void
 serve_add (char *arg)
+{
     do_cvs_command ("add", add);
+}
 static void
 serve_remove (char *arg)
+{
     do_cvs_command ("remove", cvsremove);
 @@ -5478,27 +5496,27 @@ serve_gzip_contents (char *arg)
+    {
 	level = config->MinCompressionLevel;
 	forced = true;
+    }
     if (config && level > config->MaxCompressionLevel)
+    {
 	level = config->MaxCompressionLevel;
 	forced = true;
+    }
     if (forced && !quiet
 	&& alloc_pending_warning (120 + strlen (program_name)))
 	sprintf (pending_warning_text,
-"E %s server: Forcing compression level %d (allowed: %d <= z <= %d).",
+"E %s server: Forcing compression level %d (allowed: %zu <= z <= %zu).",
 		 program_name, level, config->MinCompressionLevel,
 		 config->MaxCompressionLevel);
     gzip_level = file_gzip_level = level;
+}
 static void
 serve_gzip_stream (char *arg)
+{
     int level;
     bool forced = false;
 @@ -5509,27 +5527,27 @@ serve_gzip_stream (char *arg)
+    {
 	level = config->MinCompressionLevel;
 	forced = true;
+    }
     if (config && level > config->MaxCompressionLevel)
+    {
 	level = config->MaxCompressionLevel;
 	forced = true;
+    }
     if (forced && !quiet
 	&& alloc_pending_warning (120 + strlen (program_name)))
 	sprintf (pending_warning_text,
-"E %s server: Forcing compression level %d (allowed: %d <= z <= %d).",
+"E %s server: Forcing compression level %d (allowed: %zu <= z <= %zu).",
 		 program_name, level, config->MinCompressionLevel,
 		 config->MaxCompressionLevel);
     gzip_level = level;
     /* All further communication with the client will be compressed.
+     *
      * The deflate buffers need to be initialized even for compression level
      * 0, or the client will no longer be able to understand us.  At
      * compression level 0, the correct compression headers will be created and
      * sent, but data will thereafter simply be copied to the network buffers.
      */
 @@ -5926,26 +5944,31 @@ struct request requests[] =
   REQ_LINE("Gssapi-encrypt", serve_gssapi_encrypt, RQ_ROOTLESS),
 #  endif
 #endif
 #ifdef HAVE_GSSAPI
   REQ_LINE("Gssapi-authenticate", serve_gssapi_authenticate, RQ_ROOTLESS),
 #endif
   REQ_LINE("expand-modules", serve_expand_modules, 0),
   REQ_LINE("ci", serve_ci, RQ_ESSENTIAL),
   REQ_LINE("co", serve_co, RQ_ESSENTIAL),
   REQ_LINE("update", serve_update, RQ_ESSENTIAL),
   REQ_LINE("diff", serve_diff, 0),
   REQ_LINE("log", serve_log, 0),
   REQ_LINE("rlog", serve_rlog, 0),
   /* cvsacl patch */
   REQ_LINE("acl", serve_acl, 0),
   REQ_LINE("racl", serve_racl, 0),
   REQ_LINE("list", serve_ls, 0),
   REQ_LINE("rlist", serve_rls, 0),
   /* This allows us to avoid sending `-q' as a command argument to `cvs ls',
    * or more accurately, allows us to send `-q' to backwards CVSNT servers.
    */
   REQ_LINE("global-list-quiet", serve_noop, RQ_ROOTLESS),
   /* Deprecated synonym for rlist, for compatibility with CVSNT. */
   REQ_LINE("ls", serve_rls, 0),
   REQ_LINE("add", serve_add, 0),
   REQ_LINE("remove", serve_remove, 0),
   REQ_LINE("update-patches", serve_ignore, 0),
   REQ_LINE("gzip-file-contents", serve_gzip_contents, RQ_ROOTLESS),
   REQ_LINE("status", serve_status, 0),
 @@ -6222,27 +6245,28 @@ server_cleanup (void)
 				while (read (i, buf, sizeof (buf)) >= 1)
+				    ;
+			    }
 			    break;
 			default:
 			    abort ();
+		    }
+		}
+	    }
 #endif /* SUNOS_KLUDGE */
 	    /* Make sure our working directory isn't inside the tree we're
 	       going to delete.  */
-	    CVS_CHDIR (get_cvs_tmp_dir ());
+	    if (CVS_CHDIR (get_cvs_tmp_dir ()) == -1)
 		error (0, errno, "Cannot chdir to `%s'", get_cvs_tmp_dir ());
 	    /* Temporarily clear noexec, so that we clean up our temp directory
 	       regardless of it (this could more cleanly be handled by moving
 	       the noexec check to all the unlink_file_dir callers from
 	       unlink_file_dir itself).  */
 	    save_noexec = noexec;
 	    /* SIG_beginCrSect(); */
 	    noexec = 0;
 	    unlink_file_dir (orig_server_temp_dir);
 	    noexec = save_noexec;
 	    /* SIG_endCrSect(); */
 	} /* !dont_delete_temp */
 @@ -6543,26 +6567,30 @@ switch_to_user (const char *cvs_username
             pam_stage = "get pam user";
             retval = pam_get_item (pamh, PAM_USER, (const void **)&username);
+        }
         if (retval != PAM_SUCCESS)
+        {
             printf("E PAM %s error: %s\n", pam_stage,
                     pam_strerror (pamh, retval));
             exit (EXIT_FAILURE);
+        }
+    }
 #endif
     /* cvsacl patch */
     if (use_cvs_acl && cvs_server_run_as)
 	username = cvs_server_run_as;
     pw = getpwnam (username);
     if (pw == NULL)
+    {
 	/* check_password contains a similar check, so this usually won't be
 	   reached unless the CVS user is mapped to an invalid system user.  */
 	printf ("E Fatal error, aborting.\n\
 error 0 %s: no such system user\n", username);
 	exit (EXIT_FAILURE);
+    }
     if (pw->pw_uid == 0)
+    {
 @@ -7242,26 +7270,29 @@ pserver_authenticate_connection (void)
 # ifdef HAVE_SYSLOG_H
 	syslog (LOG_DAEMON | LOG_NOTICE, "login refused for %s", repository);
 # endif /* HAVE_SYSLOG_H */
 	goto i_hate_you;
+    }
     /* OK, now parse the config file, so we can use it to control how
        to check passwords.  If there was an error parsing the config
        file, parse_config already printed an error.  We keep going.
        Why?  Because if we didn't, then there would be no way to check
        in a new CVSROOT/config file to fix the broken one!  */
     config = get_root_allow_config (repository, gConfigPath);
     /* cvsacl patch */
     parse_aclconfig (repository);
     /* We need the real cleartext before we hash it. */
     descrambled_password = descramble (password);
     host_user = check_password (username, descrambled_password, repository);
     if (host_user == NULL)
+    {
 # ifdef HAVE_SYSLOG_H
 	syslog (LOG_DAEMON | LOG_NOTICE, "login failure (for %s)", repository);
 # endif /* HAVE_SYSLOG_H */
 	memset (descrambled_password, 0, strlen (descrambled_password));
 	free (descrambled_password);
     i_hate_you:
 	buf_output0 (buf_to_net, "I HATE YOU\n");
 	buf_flush (buf_to_net, true);