[Cvs-cvs] ccvs/src ChangeLog cvsrc.c

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/03/31 21:54:57

Modified files:
        src            : ChangeLog cvsrc.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3361&tr2=1.3362&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/cvsrc.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3361 ccvs/src/ChangeLog:1.3362
--- ccvs/src/ChangeLog:1.3361   Tue Mar 28 15:30:22 2006
+++ ccvs/src/ChangeLog  Fri Mar 31 21:54:57 2006
@@ -1,3 +1,8 @@
+2006-03-31  Mark D. Baushke  <address@hidden>
+
+       * cvsrc.c (read_cvsrc): Deal with \r\n (DOS) line endings in
+       .cvsrc files.
+
 2006-03-28  Derek Price  <address@hidden>
 
        [patch #4992]
Index: ccvs/src/cvsrc.c
diff -u ccvs/src/cvsrc.c:1.30 ccvs/src/cvsrc.c:1.31
--- ccvs/src/cvsrc.c:1.30       Wed Mar 16 15:52:14 2005
+++ ccvs/src/cvsrc.c    Fri Mar 31 21:54:57 2006
@@ -120,9 +120,9 @@
     if (found)
     {
        /* skip over command in the options line */
-       for (optstart = strtok (line + command_len, "\t \n");
+       for (optstart = strtok (line + command_len, "\t \n\r");
             optstart;
-            optstart = strtok (NULL, "\t \n"))
+            optstart = strtok (NULL, "\t \n\r"))
        {
            new_argv [new_argc++] = xstrdup (optstart);