diff options
| author | Kelly Yancey <kbyanc@FreeBSD.org> | 2000-08-02 06:54:21 +0000 |
|---|---|---|
| committer | Kelly Yancey <kbyanc@FreeBSD.org> | 2000-08-02 06:54:21 +0000 |
| commit | d1b04ce6b7bfd4d77ca5ba0d271a9d904107de65 (patch) | |
| tree | 45a8292183ed0c403f716cc0887040522f39d11b /gnu/usr.bin/patch | |
| parent | 8eb3acc9be996f45358b20048eb44a322f0c2f6e (diff) | |
Notes
Diffstat (limited to 'gnu/usr.bin/patch')
| -rw-r--r-- | gnu/usr.bin/patch/patch.c | 1 | ||||
| -rw-r--r-- | gnu/usr.bin/patch/pch.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c index 0e37ddb46461..0a32fa7a3243 100644 --- a/gnu/usr.bin/patch/patch.c +++ b/gnu/usr.bin/patch/patch.c @@ -313,7 +313,6 @@ char **argv; newwhere = pch_newfirst() + last_offset; if (skip_rest_of_patch) { abort_hunk(); - failed++; if (verbose) say3("Hunk #%d ignored at %ld.\n", hunk, newwhere); } diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c index 6acf5957f0ec..71bbd255c9ff 100644 --- a/gnu/usr.bin/patch/pch.c +++ b/gnu/usr.bin/patch/pch.c @@ -174,7 +174,7 @@ there_is_another_patch() say3("(Patch is indented %d space%s.)\n", p_indent, p_indent==1?"":"s"); skip_to(p_start,p_sline); while (filearg[0] == Nullch) { - if (force || batch) { + if (force || batch || skip_rest_of_patch) { say1("No file to patch. Skipping...\n"); filearg[0] = savestr(bestguess); skip_rest_of_patch = TRUE; |
