[Cvs-cvs] Changes to ccvs/src/recurse.c

[Larry Jones]

Index: ccvs/src/recurse.c
diff -u ccvs/src/recurse.c:1.113 ccvs/src/recurse.c:1.114
--- ccvs/src/recurse.c:1.113    Thu Sep  1 13:49:01 2005
+++ ccvs/src/recurse.c  Fri Sep  2 21:51:09 2005
@@ -398,11 +398,8 @@
                addfile (&files_by_dir, dir, comp);
            else if (isdir (dir))
            {
-               if ((which & W_LOCAL) && isdir (CVSADM)
-#ifdef CLIENT_SUPPORT
-                   && !current_parsed_root->isremote
-#endif
-                   )
+               if ((which & W_LOCAL) && isdir (CVSADM) &&
+                   !current_parsed_root->isremote)
                {
                    /* otherwise, look for it in the repository. */
                    char *tmp_update_dir;
@@ -678,22 +675,16 @@
        directories, since we're guaranteed to have only one CVSROOT --
        our own.  */
 
-    if (
-       /* If -d was specified, it should override CVS/Root.
-
-          In the single-repository case, it is long-standing CVS behavior
-          and makes sense - the user might want another access method,
-          another server (which mounts the same repository), &c.
-
-          In the multiple-repository case, -d overrides all CVS/Root
-          files.  That is the only plausible generalization I can
-          think of.  */
-       CVSroot_cmdline == NULL
+    /* If -d was specified, it should override CVS/Root.
 
-#ifdef SERVER_SUPPORT
-       && ! server_active
-#endif
-       )
+       In the single-repository case, it is long-standing CVS behavior
+       and makes sense - the user might want another access method,
+       another server (which mounts the same repository), &c.
+
+       In the multiple-repository case, -d overrides all CVS/Root
+       files.  That is the only plausible generalization I can
+       think of.  */
+    if (CVSroot_cmdline == NULL && !server_active)
     {
        cvsroot_t *this_root = Name_Root (NULL, update_dir);
        if (this_root != NULL)
@@ -1134,22 +1125,16 @@
     /* Only process this directory if the root matches.  This nearly
        duplicates code in do_recursion. */
 
-    if (
-       /* If -d was specified, it should override CVS/Root.
-
-          In the single-repository case, it is long-standing CVS behavior
-          and makes sense - the user might want another access method,
-          another server (which mounts the same repository), &c.
-
-          In the multiple-repository case, -d overrides all CVS/Root
-          files.  That is the only plausible generalization I can
-          think of.  */
-       CVSroot_cmdline == NULL
+    /* If -d was specified, it should override CVS/Root.
 
-#ifdef SERVER_SUPPORT
-       && ! server_active
-#endif
-       )
+       In the single-repository case, it is long-standing CVS behavior
+       and makes sense - the user might want another access method,
+       another server (which mounts the same repository), &c.
+
+       In the multiple-repository case, -d overrides all CVS/Root
+       files.  That is the only plausible generalization I can
+       think of.  */
+    if (CVSroot_cmdline == NULL && !server_active)
     {
        cvsroot_t *this_root = Name_Root (dir, update_dir);
        if (this_root != NULL)