diff options
| author | Jim Meyering <jim@meyering.net> | 2007-02-02 01:22:58 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-02-02 01:22:58 +0100 |
| commit | 1d72903fafbd744ea57b25c47607c6b0c9c49766 (patch) | |
| tree | b68caccce7a55a743289e2c0d1119e11368d5067 | |
| parent | 82276cbd2e101862d1f7a7a7d282dd4afc5dd398 (diff) | |
| download | coreutils-1d72903fafbd744ea57b25c47607c6b0c9c49766.tar.xz | |
* 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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.maint | 2 | ||||
| -rw-r--r-- | src/c99-to-c89.diff | 6 |
3 files changed, 13 insertions, 4 deletions
@@ -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 d526baacd..53b61b684 100644 --- 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 04db772c4..997b0093a 100644 --- 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 |