[Cvs-cvs] ccvs/src ChangeLog base.c server.c sign.c update.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/04 16:20:27

Modified files:
        src            : ChangeLog base.c server.c sign.c update.c 

Log message:
        [bug #16449]  Compile with --disable-server.
        * server.c: Don't compile server-only functions without server support.
        * base.c, sign.c, update.c: Don't call server-only functions without
        server support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3394&tr2=1.3395&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/base.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?tr1=1.460&tr2=1.461&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sign.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/update.c.diff?tr1=1.261&tr2=1.262&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3394 ccvs/src/ChangeLog:1.3395
--- ccvs/src/ChangeLog:1.3394   Thu May  4 15:38:11 2006
+++ ccvs/src/ChangeLog  Thu May  4 16:20:27 2006
@@ -1,5 +1,10 @@
 2006-05-04  Derek Price  <address@hidden>
 
+       [bug #16449]  Compile with --disable-server.
+       * server.c: Don't compile server-only functions without server support.
+       * base.c, sign.c, update.c: Don't call server-only functions without
+       server support.
+
        * client.c (send_file_names): Suppress compiler warning.
 
        [bug #16450]  Compile with --disable-case-sensitivity.
Index: ccvs/src/base.c
diff -u ccvs/src/base.c:1.2 ccvs/src/base.c:1.3
--- ccvs/src/base.c:1.2 Mon Apr 24 18:50:25 2006
+++ ccvs/src/base.c     Thu May  4 16:20:27 2006
@@ -277,9 +277,11 @@
 
     /* FIXME: Verify the signature in local mode.  */
 
+#ifdef SERVER_SUPPORT
     if (server_active && strcmp (cvs_cmd_name, "export"))
        server_base_checkout (rcs, finfo, prev, rev, ptag, tag,
                              poptions, options);
+#endif
 
     return status;
 }
@@ -313,9 +315,12 @@
     noexec = save_noexec;
 
     assert (strcmp (cvs_cmd_name, "export"));
+
+#ifdef SERVER_SUPPORT
     if (server_active)
        server_temp_checkout (rcs, finfo, prev, rev, ptag, tag,
                              poptions, options, tempfile);
+#endif
 
     return tempfile;
 }
@@ -438,8 +443,10 @@
     if (flags[1] == 'y')
        xchmod (finfo->file, true);
 
+#ifdef SERVER_ACTIVE
     if (server_active && strcmp (cvs_cmd_name, "export"))
        server_base_copy (finfo, rev ? rev : "", flags);
+#endif
 
     if (suppress_bases || tempfile)
     {
@@ -558,8 +565,10 @@
     else
        retval = 0;
 
+#ifdef SERVER_SUPPORT
     if (server_active)
        server_base_merge (finfo, rev1, rev2);
+#endif
 
     if (CVS_UNLINK (f1) < 0)
        error (0, errno, "unable to remove `%s'", f1);
@@ -594,13 +603,16 @@
 {
     int status, err;
 
+#ifdef SERVER_SUPPORT
     if (server_use_bases ())
     {
        server_base_diff (finfo, f1, use_rev1, label1, f2, use_rev2, label2);
 
        err = 0;
     }
-    else if (xcmp (f1, f2))
+    else
+#endif
+    if (xcmp (f1, f2))
     {
        RCS_output_diff_options (diff_argc, diff_argv, empty_files,
                                 use_rev1, use_rev2, finfo->fullname);
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.460 ccvs/src/server.c:1.461
--- ccvs/src/server.c:1.460     Thu May  4 07:39:12 2006
+++ ccvs/src/server.c   Thu May  4 16:20:27 2006
@@ -5496,15 +5496,6 @@
 
 
 
-/* Return whether we should send operations on base files.  */
-bool
-server_use_bases (void)
-{
-    return supported_response ("Base-checkout");
-}
-
-
-
 /* Return whether we should send patches in RCS format.  */
 int
 server_use_rcs_diff (void)
@@ -8251,6 +8242,20 @@
 
 
 
+/* Return whether we should send operations on base files.  */
+bool
+server_use_bases (void)
+{
+#ifdef SERVER_SUPPORT
+    return supported_response ("Base-checkout");
+#else /* !SERVER_SUPPORT */
+    return 0;
+#endif
+}
+
+
+
+#ifdef SERVER_SUPPORT
 static void
 server_send_signatures (struct file_info *finfo, const char *rev)
 {
@@ -8566,6 +8571,7 @@
 
     return;
 }
+#endif /* SERVER_SUPPORT */
 
 
 
Index: ccvs/src/sign.c
diff -u ccvs/src/sign.c:1.2 ccvs/src/sign.c:1.3
--- ccvs/src/sign.c:1.2 Mon Apr 24 18:50:27 2006
+++ ccvs/src/sign.c     Thu May  4 16:20:27 2006
@@ -448,8 +448,10 @@
                                             vers->vn_rcs
                                             ? vers->vn_rcs : vers->vn_user,
                                             args->keyid);
+#ifdef SERVER_SUPPORT
        if (server_active)
            server_base_signatures (finfo, vers->vn_user);
+#endif
        return err;
     }
 
@@ -502,8 +504,10 @@
            }
 
            RCS_add_openpgp_signature (finfo, vers->vn_user);
+#ifdef SERVER_SUPPORT
            if (server_active)
                server_base_signatures (finfo, vers->vn_user);
+#endif
            break;
        default:                        /* can't ever happen :-) */
            error (0, 0,
Index: ccvs/src/update.c
diff -u ccvs/src/update.c:1.261 ccvs/src/update.c:1.262
--- ccvs/src/update.c:1.261     Mon Apr 24 18:50:27 2006
+++ ccvs/src/update.c   Thu May  4 16:20:27 2006
@@ -125,8 +125,8 @@
 static int update_prune_dirs = 0;
 static int pipeout = 0;
 static int dotemplate = 0;
-#ifdef SERVER_SUPPORT
 static bool bases;
+#ifdef SERVER_SUPPORT
 static bool rcs_diff_patches;
 #endif
 static List *ignlist = NULL;
@@ -1305,7 +1305,9 @@
 
     if (file_is_dead || status == 0)
     {
+#ifdef SERVER_SUPPORT
        mode_t mode = (mode_t) -1;
+#endif
 
        if (!pipeout)
        {
@@ -2368,12 +2370,14 @@
 
            Register (finfo->entries, finfo->file, "0",
                      "Result of merge", NULL, vers->tag, vers->date, NULL);
+#ifdef SERVER_SUPPORT
            if (server_active)
                /* No need to create a backup for an addition - if the file
                 * exists, the client will abort with a warning.
                 */
                server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1,
                                NULL, NULL);
+#endif /* SERVER_SUPPORT */
 
            freevers_ts (&xvers);
            return;