Module Name:    src
Committed By:   snj
Date:           Sat Feb  6 21:04:24 UTC 2016

Modified Files:
        src/external/gpl2/xcvs/dist/src [netbsd-7-0]: import.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1099):
        external/gpl2/xcvs/dist/src/import.c: revision 1.4
Remove trailing whitespace from imported messages when adding now files.
This is done in RCS_checkin() but we have a "fast path" for new files here
that does not do it. Hooray for specialized code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/external/gpl2/xcvs/dist/src/import.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/xcvs/dist/src/import.c
diff -u src/external/gpl2/xcvs/dist/src/import.c:1.3 src/external/gpl2/xcvs/dist/src/import.c:1.3.12.1
--- src/external/gpl2/xcvs/dist/src/import.c:1.3	Thu Mar  8 20:47:45 2012
+++ src/external/gpl2/xcvs/dist/src/import.c	Sat Feb  6 21:04:24 2016
@@ -579,7 +579,7 @@ static int
 process_import_file (char *message, char *vfile, char *vtag, int targc,
 		     char **targv)
 {
-    char *rcs;
+    char *rcs, *cleanmessage;
     int inattic = 0;
 
     rcs = Xasprintf ("%s/%s%s", repository, vfile, RCSEXT);
@@ -654,13 +654,14 @@ process_import_file (char *message, char
 		Entries_Close (entries);
 	    }
 #endif
-
-	    retval = add_rcs_file (message, rcs, vfile, vhead, our_opt,
+	    cleanmessage = make_message_rcsvalid (message);
+	    retval = add_rcs_file (cleanmessage, rcs, vfile, vhead, our_opt,
 				   vbranch, vtag, targc, targv,
 				   NULL, 0, logfp, killnew);
 	    if (free_opt != NULL)
 		free (free_opt);
 	    free (rcs);
+	    free (cleanmessage);
 	    return retval;
 	}
 	free (attic_name);

Reply via email to