[Cvs-cvs] Changes to ccvs/src/main.c [cvs1-11-x-branch]

[Larry Jones]

Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.172.4.15 ccvs/src/main.c:1.172.4.16
--- ccvs/src/main.c:1.172.4.15  Thu Sep  1 13:44:15 2005
+++ ccvs/src/main.c     Fri Sep  2 19:37:34 2005
@@ -706,21 +706,18 @@
            cvs_cmd_name = "server";
        }
 # endif /* AUTH_SERVER_SUPPORT || HAVE_GSSAPI */
+#endif /* SERVER_SUPPORT */
 
        server_active = strcmp (cvs_cmd_name, "server") == 0;
 
-#endif /* SERVER_SUPPORT */
-
        /* This is only used for writing into the history file.  For
           remote connections, it might be nice to have hostname
           and/or remote path, on the other hand I'm not sure whether
           it is worth the trouble.  */
 
-#ifdef SERVER_SUPPORT
        if (server_active)
            CurDir = xstrdup ("<remote>");
        else
-#endif
        {
            CurDir = xgetwd ();
             if (CurDir == NULL)
@@ -779,13 +776,11 @@
        if (use_cvsrc)
            read_cvsrc (&argc, &argv, cvs_cmd_name);
 
-#ifdef SERVER_SUPPORT
        /* Fiddling with CVSROOT doesn't make sense if we're running
         * in server mode, since the client will send the repository
         * directory after the connection is made.
         */
        if (!server_active)
-#endif
        {
            /* First check if a root was set via the command line.  */
            if (CVSroot_cmdline)
@@ -872,20 +867,14 @@
           once).  To get out of the loop, we perform a "break" at the
           end of things.  */
 
-       while (
-#ifdef SERVER_SUPPORT
-              server_active ||
-#endif
-              walklist (root_directories, set_root_directory, NULL)
-              )
+       while (server_active ||
+              walklist (root_directories, set_root_directory, NULL))
        {
-#ifdef SERVER_SUPPORT
            /* Fiddling with CVSROOT doesn't make sense if we're running
               in server mode, since the client will send the repository
               directory after the connection is made. */
 
            if (!server_active)
-#endif
            {
                /* Now we're 100% sure that we have a valid CVSROOT
                   variable.  Parse it to see if we're supposed to do
@@ -898,9 +887,7 @@
                /*
                 * Check to see if the repository exists.
                 */
-#ifdef CLIENT_SUPPORT
                if (!current_parsed_root->isremote)
-#endif /* CLIENT_SUPPORT */
                {
                    char *path;
                    int save_errno;
@@ -926,7 +913,6 @@
                {
                    static char *prev;
                    char *env;
-                   size_t dummy;
 
                    env = xmalloc (strlen (CVSROOT_ENV)
                                   + strlen (current_parsed_root->original)
@@ -950,14 +936,7 @@
               predetermine whether CVSROOT/config overrides things from
               read_cvsrc and other such places or vice versa.  That sort
               of thing probably needs more thought.  */
-           if (1
-#ifdef SERVER_SUPPORT
-               && !server_active
-#endif
-#ifdef CLIENT_SUPPORT
-               && !current_parsed_root->isremote
-#endif
-               )
+           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
@@ -987,9 +966,7 @@
                active, our list will be empty -- don't try and
                remove it from the list. */
 
-#ifdef SERVER_SUPPORT
            if (!server_active)
-#endif /* SERVER_SUPPORT */
            {
                Node *n = findnode (root_directories,
                                    current_parsed_root->original);
@@ -1000,13 +977,11 @@
                current_parsed_root = NULL;
            }
 
-#ifdef SERVER_SUPPORT
            if (server_active)
            {
                server_active = 0;
                break;
            }
-#endif
        } /* end of loop for cvsroot values */
 
        dellist (&root_directories);