[Cvs-cvs] Changes to ccvs/src/base.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/base.c
diff -u ccvs/src/base.c:1.1.2.2 ccvs/src/base.c:1.1.2.3
--- ccvs/src/base.c:1.1.2.2     Fri Nov 18 20:02:07 2005
+++ ccvs/src/base.c     Tue Nov 22 18:03:44 2005
@@ -251,22 +251,20 @@
               const char *options, bool writable)
 {
     int status;
+    char *basefile;
 
     mkdir_if_needed (CVSADM_BASE);
 
-    if (!current_parsed_root->isremote)
-    {
-       char *basefile = make_base_file_name (finfo->file, rev);
-       status = RCS_checkout (rcs, basefile, rev, tag, options,
-                              NULL, NULL, NULL);
-       xchmod (basefile, writable);
-       free (basefile);
-    }
-    else
-       status = 0;
+    assert (!current_parsed_root->isremote);
+
+    basefile = make_base_file_name (finfo->file, rev);
+    status = RCS_checkout (rcs, basefile, rev, tag, options,
+                          NULL, NULL, NULL);
+    xchmod (basefile, writable);
+    free (basefile);
 
     if (server_active)
-       server_base_checkout (finfo, options, prev, rev);
+       server_base_checkout (rcs, finfo, prev, rev, tag, options);
 
     return status;
 }
@@ -282,4 +280,15 @@
 
     if (server_active)
        server_base_copy (finfo, rev, exists);
+}
+
+
+
+void
+base_remove (const char *file, const char *rev)
+{
+    char *basefile = make_base_file_name (file, rev);
+    if (unlink_file (basefile) < 0 && !existence_error (errno))
+       error (0, errno, "Failed to remove `%s'", basefile);
+    free (basefile);
 }