* src/c99-to-c89.diff: Make shred.c Index: and a/b prefixes

consistent, so this can be applied with patch -p0.
Reported by Matthew Woehlke.

* Makefile.maint (patch-check): Use patch with its -p2 option,
since that makes this check slightly more strict.

diff --git a/ChangeLog b/ChangeLog
index d0de2f44c7a4be1a4b7745ca5f92b66574a5cf94..ee43b25a12405ae4d4b7cd3ef022f7ff540bdb99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-02  Jim Meyering  <jim@meyering.net>
+
+       * src/c99-to-c89.diff: Make shred.c Index: and a/b prefixes
+       consistent, so this can be applied with patch -p0.
+       Reported by Matthew Woehlke.
+
+       * Makefile.maint (patch-check): Use patch with its -p2 option,
+       since that makes this check slightly more strict.
+
 2007-01-29  Jim Meyering  <jim@meyering.net>
 
        Plug a leak in ls.

diff --git a/Makefile.maint b/Makefile.maint
index d526baacda6edeebc4122d135a3a17c403162262..53b61b684c8739fb2510878ee8cb5969fe19f53b 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -329,7 +329,7 @@ sc_useless_cpp_parens:
 patch-check:
        rm -rf src-c89 $@.1 $@.2
        cp -a src src-c89
-       (cd src-c89; patch -V never --fuzz=0) < src/c99-to-c89.diff \
+       (cd src-c89; patch -p2 -V never --fuzz=0) < src/c99-to-c89.diff \
          > $@.1 2>&1
        if test "$${REGEN_PATCH+set}" = set; then \
          diff -upr src src-c89 > new-diff || : ; fi

diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index 04db772c463fd33ebacf3ea24dee694b4282bd99..997b0093aa7a4b13face513872ac8718be3777df 100644 (file)
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -83,13 +83,13 @@ index 364a21c..7a24014 100644
 +  }
 +  }
  }
-Index: shred.c
+Index: src/shred.c
 ===================================================================
 RCS file: /fetish/cu/src/shred.c,v
 retrieving revision 1.130
 diff -u -p -r1.130 shred.c
---- shred.c     3 Sep 2006 02:53:16 -0000       1.130
-+++ shred.c     3 Oct 2006 13:48:24 -0000
+--- a/src/shred.c     3 Sep 2006 02:53:16 -0000       1.130
++++ b/src/shred.c     3 Oct 2006 13:48:24 -0000
 @@ -464,7 +464,7 @@ dopass (int fd, char const *qname, off_t
                     out.  Thus, it shouldn't give up on bad blocks.  This
                     code works because lim is always a multiple of