[src/netbsd-6]: src/external/gpl2/xcvs/dist/src Pull up following revision(s)...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3879dc395891
branches:  netbsd-6
changeset: 777075:3879dc395891
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jul 14 07:02:27 2016 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1364):
        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.
XXX: pullup 6, 7

diffstat:

 external/gpl2/xcvs/dist/src/import.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 6ac155b0de4a -r 3879dc395891 external/gpl2/xcvs/dist/src/import.c
--- a/external/gpl2/xcvs/dist/src/import.c      Thu Jul 14 06:57:12 2016 +0000
+++ b/external/gpl2/xcvs/dist/src/import.c      Thu Jul 14 07:02:27 2016 +0000
@@ -579,7 +579,7 @@
 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 @@
                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);