diff options
| author | Rob Landley <rob@landley.net> | 2019-09-11 04:19:03 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-09-11 04:19:03 -0500 |
| commit | f096460edaf2f50dbeadc3dd9e5ef7f9d50e3792 (patch) | |
| tree | 653133b03ba25f75c3444beb05de3519622ed9a7 | |
| parent | be5697562cc87c7d1281ad5752ddf30ae9d2ce79 (diff) | |
| download | toybox-f096460edaf2f50dbeadc3dd9e5ef7f9d50e3792.tar.gz | |
Add NOP -f, -g#, and --no-backup-if-mismatch options.
(All ignored, because they disable stuff we don't do.)
| -rw-r--r-- | toys/posix/patch.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/toys/posix/patch.c b/toys/posix/patch.c index 4850d5df..3234a1f0 100644 --- a/toys/posix/patch.c +++ b/toys/posix/patch.c @@ -14,11 +14,10 @@ * -r rejectfile write rejected hunks to this file * * -E remove empty files --remove-empty-files - * -f force (no questions asked) * -F fuzz (number, default 2) * [file] which file to patch -USE_PATCH(NEWTOY(patch, "(dry-run)"USE_TOYBOX_DEBUG("x")"ulp#d:i:Rs(quiet)", TOYFLAG_USR|TOYFLAG_BIN)) +USE_PATCH(NEWTOY(patch, "(no-backup-if-mismatch)(dry-run)"USE_TOYBOX_DEBUG("x")"g#fulp#d:i:Rs(quiet)", TOYFLAG_USR|TOYFLAG_BIN)) config PATCH bool "patch" @@ -50,7 +49,7 @@ config PATCH GLOBALS( char *i, *d; - long p; + long p, g; struct double_list *current_hunk; long oldline, oldlen, newline, newlen; |