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

[Derek Robert Price]

Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.452.2.7 ccvs/src/server.c:1.452.2.8
--- ccvs/src/server.c:1.452.2.7 Wed Nov 30 19:58:46 2005
+++ ccvs/src/server.c   Thu Dec  1 01:49:00 2005
@@ -8190,12 +8190,12 @@
        int status;
        char *pbasefile;
 
-       pbasefile = make_base_file_name (finfo->file, prev);
+       pbasefile = cvs_temp_name ();
        status = RCS_checkout (rcs, pbasefile, prev, tag, options,
                               NULL, NULL, NULL);
        if (status)
            error (1, 0, "Failed to checkout revision %s of `%s'",
-                  finfo->file, prev);
+                  prev, finfo->file);
 
        run_add_arg_p (&dargc, &darg_allocated, &dargv, "-n");
        tmpfile = cvs_temp_name ();
@@ -8203,7 +8203,7 @@
                            tmpfile);
        run_arg_free_p (dargc, dargv);
        free (dargv);
-       if (unlink_file (pbasefile) < 0)
+       if (CVS_UNLINK (pbasefile) < 0)
            error (0, errno, "cannot remove `%s'", pbasefile);
        free (pbasefile);