 @@ -128,26 +128,29 @@ static const struct cmd
        habits will expect a certain abbreviation to be unique, and in
        a future release of CVS it may not be.  So it is better to
        accept only an explicit list of abbreviations and plan on
        supporting them in the future as well as now.  */
     const char *nick1;
     const char *nick2;
     int (*func) (int, char **);	/* Function takes (argc, argv) arguments. */
     unsigned long attr;		/* Attributes. */
 } cmds[] =
+{
     /* cvsacl patch */
     { "acl",      NULL,       NULL,		   cvsacl,    CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
     { "racl",     NULL,       NULL,		   cvsacl,    CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
     { "add",      "ad",       "new",       add,       CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
     { "admin",    "adm",      "rcs",       admin,     CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
     { "annotate", "ann",      NULL,        annotate,  CVS_CMD_USES_WORK_DIR },
     { "checkout", "co",       "get",       checkout,  0 },
     { "commit",   "ci",       "com",       commit,    CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
     { "diff",     "di",       "dif",       diff,      CVS_CMD_USES_WORK_DIR },
     { "edit",     NULL,       NULL,        edit,      CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
     { "editors",  NULL,       NULL,        editors,   CVS_CMD_USES_WORK_DIR },
     { "export",   "exp",      "ex",        checkout,  CVS_CMD_USES_WORK_DIR },
     { "history",  "hi",       "his",       history,   CVS_CMD_USES_WORK_DIR },
     { "import",   "im",       "imp",       import,    CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR | CVS_CMD_IGNORE_ADMROOT},
     { "init",     NULL,       NULL,        init,      CVS_CMD_MODIFIES_REPOSITORY },
 #if defined (HAVE_KERBEROS) && defined (SERVER_SUPPORT)
 @@ -221,50 +224,52 @@ static const char *const usg[] =
        in one line.  I'm not sure one can get more concise than the
        paragraph in ../cvs.spec without assuming the reader knows what
        version control means.  */
     "For CVS updates and additional information, see\n",
     "    the CVS home page at http://www.nongnu.org/cvs/ or\n",
     "    the CVSNT home page at http://www.cvsnt.org/\n",
     NULL,
 };
 static const char *const cmd_usage[] =
+{
     "CVS commands are:\n",
     "        acl          Add/modify/delete ACLs in files and directories\n",
     "        add          Add a new file/directory to the repository\n",
     "        admin        Administration front end for rcs\n",
     "        annotate     Show last revision where each line was modified\n",
     "        checkout     Checkout sources for editing\n",
     "        commit       Check files into the repository\n",
     "        diff         Show differences between revisions\n",
     "        edit         Get ready to edit a watched file\n",
     "        editors      See who is editing a watched file\n",
     "        export       Export sources from CVS, similar to checkout\n",
     "        history      Show repository access history\n",
     "        import       Import sources into CVS, using vendor branches\n",
     "        init         Create a CVS repository if it doesn't exist\n",
 #if defined (HAVE_KERBEROS) && defined (SERVER_SUPPORT)
     "        kserver      Kerberos server mode\n",
 #endif
     "        log          Print out history information for files\n",
 #ifdef AUTH_CLIENT_SUPPORT
     "        login        Prompt for password for authenticating server\n",
     "        logout       Removes entry in .cvspass for remote repository\n",
 #endif /* AUTH_CLIENT_SUPPORT */
     "        ls           List files available from CVS\n",
 #if (defined(AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)) && defined(SERVER_SUPPORT)
     "        pserver      Password server mode\n",
 #endif
     "        racl         Add/modify/delete ACLs in files and directories\n",
     "        rannotate    Show last revision where each line of module was modified\n",
     "        rdiff        Create 'patch' format diffs between releases\n",
     "        release      Indicate that a Module is no longer in use\n",
     "        remove       Remove an entry from the repository\n",
     "        rlog         Print out history information for a module\n",
     "        rls          List files in a module\n",
     "        rtag         Add a symbolic tag to a module\n",
 #ifdef SERVER_SUPPORT
     "        server       Server mode\n",
 #endif
     "        status       Display status information on checked out files\n",
     "        tag          Add a symbolic tag to checked out version of files\n",
     "        unedit       Undo an edit command\n",
 @@ -1117,26 +1122,29 @@ cause intermittent sandbox corruption.")
 	    if (!server_active && !current_parsed_root->isremote)
+	    {
 		/* 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!  */
 		if (config) free_config (config);
 		config = parse_config (current_parsed_root->directory, NULL);
 		/* Can set TMPDIR in the environment if necessary now, since
 		 * if it was set in config, we now know it.
 		 */
 		push_env_temp_dir ();
 		/* cvsacl patch */
 		parse_aclconfig (current_parsed_root->directory);
+	    }
 #ifdef CLIENT_SUPPORT
 	    /* Need to check for current_parsed_root != NULL here since
 	     * we could still be in server mode before the server function
 	     * gets called below and sets the root
 	     */
 	    if (current_parsed_root != NULL && current_parsed_root->isremote)
+	    {
 		/* Create a new list for directory names that we've
 		   sent to the server. */
 		if (dirs_sent_to_server != NULL)
 		    dellist (&dirs_sent_to_server);
 @@ -1496,19 +1504,19 @@ getoptreset (void)
 	optind = 1;
 #else
 	optind = 0;
 #endif
 	opterr = 1;
+}
 void
 usage (register const char *const *cpp)
+{
     (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
     for (; *cpp; cpp++)
-	(void) fprintf (stderr, *cpp);
+	(void) fprintf (stderr, "%s", *cpp);
     exit (EXIT_FAILURE);
+}
 /* vim:tabstop=8:shiftwidth=4
  */