Re: patch2.5.9 fails on some dos generated patches

[Paul Eggert]

This should fix your problem:

2003-07-02  Paul Eggert  <address@hidden>

        * pch.c (intuit_diff_type): If a unified-diff header line contains
        trailing CR, strip CR from each body line.  This corrects a bug
        introduced in the 2003-05-18 patch.  Bug reported by Andreas
        Gruenbacher.

--- pch.c       2003/05/20 14:03:17     1.44
+++ pch.c       2003/07/02 22:19:21     1.45
@@ -1,6 +1,6 @@
 /* reading patches */
 
-/* $Id: pch.c,v 1.44 2003/05/20 14:03:17 eggert Exp $ */
+/* $Id: pch.c,v 1.45 2003/07/02 22:19:21 eggert Exp $ */
 
 /* Copyright (C) 1986, 1987, 1988 Larry Wall
 
@@ -366,10 +366,16 @@ intuit_diff_type (void)
        if (!stars_last_line && strnEQ(s, "*** ", 4))
            name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]);
        else if (strnEQ(s, "+++ ", 4))
+         {
            /* Swap with NEW below.  */
            name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]);
+           p_strip_trailing_cr = strip_trailing_cr;
+         }
        else if (strnEQ(s, "Index:", 6))
+         {
            name[INDEX] = fetchname (s+6, strippath, (time_t *) 0);
+           p_strip_trailing_cr = strip_trailing_cr;
+         }
        else if (strnEQ(s, "Prereq:", 7)) {
            for (t = s + 7;  ISSPACE ((unsigned char) *t);  t++)
              continue;
@@ -409,6 +415,7 @@ intuit_diff_type (void)
                    p_timestamp[NEW] = timestamp;
                    p_rfc934_nesting = (t - s) >> 1;
                  }
+               p_strip_trailing_cr = strip_trailing_cr;
              }
          }
        if ((diff_type == NO_DIFF || diff_type == ED_DIFF) &&