← Back to branch summary

~ubuntu-branches/ubuntu/hoary/cvs/hoary-security

« back to all changes in this revision

Viewing changes to debian/patches/51_newlines_in_commit_template

  • Committer: Bazaar Package Importer
  • Author(s): Steve McIntyre
  • Date: 2004-06-09 20:42:37 UTC
  • Revision ID: james.westby@ubuntu.com-20040609204237-xdqypwnaqxd965tc
Tags: 1:1.12.9-1
* New upstream version.
  + Several security fixes: CAN-2004-0414, CAN-2004-0416,
    CAN-2004-0417 & CAN-2004-0418

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/51_newlines_in_commit_template
 
1
diff -ur cvs-1.12.9/src/logmsg.c cvs-1.12.4.new/src/logmsg.c
 
2
--- cvs-1.12.9/src/logmsg.c     2002-09-20 03:48:59.000000000 +0100
 
3
+++ cvs-1.12.9.new/src/logmsg.c 2003-01-29 23:39:17.000000000 +0000
 
4
@@ -264,6 +264,11 @@
 
5
        }
 
6
     }
 
7
 
 
8
+    if (!*messagep)
 
9
+    {
 
10
+      (void) fprintf (fp, "\n");
 
11
+    }
 
12
+
 
13
     (void) fprintf (fp,
 
14
   "%s----------------------------------------------------------------------\n",
 
15
                    CVSEDITPREFIX);
 
16
@@ -362,7 +367,11 @@
 
17
        *messagep = NULL;
 
18
     }
 
19
 
 
20
-    if (pre_stbuf.st_mtime == post_stbuf.st_mtime || *messagep == NULL)
 
21
+    if (pre_stbuf.st_mtime == post_stbuf.st_mtime || 
 
22
+        *messagep == NULL ||
 
23
+        (*messagep)[0] == '\0' ||
 
24
+        strcmp (*messagep, "\n") == 0 ||
 
25
+        strcmp (*messagep, "\n\n") == 0)
 
26
     {
 
27
        for (;;)
 
28
        {