[Cvs-cvs] ccvs/src ChangeLog entries.c sanity.sh

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   08/11/19 23:10:35

Modified files:
        src            : ChangeLog entries.c sanity.sh 

Log message:
        Merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3637&r2=1.3638
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/entries.c?cvsroot=cvs&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1217&r2=1.1218

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3637
retrieving revision 1.3638
diff -u -b -r1.3637 -r1.3638
--- ChangeLog   18 Nov 2008 22:59:01 -0000      1.3637
+++ ChangeLog   19 Nov 2008 23:10:34 -0000      1.3638
@@ -1,3 +1,11 @@
+2008-11-19  Larry Jones  <address@hidden>
+
+       * entries.c (WriteTag): Remove any exiting file and recreate
+       rather than trying to overwrite (to avoid permission problems).
+
+       * sanity.sh (keyword-25): Protect keywords against accidental
+       expansion in sanity.sh itself.
+
 2008-11-18  Larry Jones  <address@hidden>
 
        * client.c (add_prune_candidate): Strip all trailing slashes.

Index: entries.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/entries.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- entries.c   17 Sep 2008 19:53:29 -0000      1.77
+++ entries.c   19 Nov 2008 23:10:35 -0000      1.78
@@ -855,22 +855,17 @@
        tmp = xstrdup (CVSADM_TAG);
 
 
+    if (unlink_file (tmp) < 0 && ! existence_error (errno))
+       error (1, errno, "cannot remove %s", tmp);
+
     if (tag || date)
     {
-       fout = xfopen (tmp, "w+");
+       fout = xfopen (tmp, "w");
        if (tag)
        {
-           if (nonbranch)
-           {
-               if (fprintf (fout, "N%s\n", tag) < 0)
-                   error (1, errno, "write to %s failed", tmp);
-           }
-           else
-           {
-               if (fprintf (fout, "T%s\n", tag) < 0)
+           if (fprintf (fout, "%c%s\n", nonbranch ? 'N' : 'T', tag) < 0)
                    error (1, errno, "write to %s failed", tmp);
            }
-       }
        else
        {
            if (fprintf (fout, "D%s\n", date) < 0)
@@ -879,9 +874,6 @@
        if (fclose (fout) == EOF)
            error (1, errno, "cannot close %s", tmp);
     }
-    else
-       if (unlink_file (tmp) < 0 && ! existence_error (errno))
-           error (1, errno, "cannot remove %s", tmp);
     free (tmp);
 #ifdef SERVER_SUPPORT
     if (server_active)

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1217
retrieving revision 1.1218
diff -u -b -r1.1217 -r1.1218
--- sanity.sh   18 Nov 2008 18:38:45 -0000      1.1217
+++ sanity.sh   19 Nov 2008 23:10:35 -0000      1.1218
@@ -26547,9 +26547,9 @@
          dotest_fail keyword-25 "${testcvs} diff -kk file1" \
 "diff -r1\.3 file1
 1c1
-< \$Name\$
+< "'\$'"Name"'\$'"
 ---
-> \$Name:  $"
+> "'\$'"Name:  "'\$'
          dotest keyword-26 "${testcvs} diff -kkv file1" ""
 
          dokeep