emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: disable debug code; remove unsupported --dry-run from help text

Browse Source 
function                                             old     new   delta
packed_usage                                       28623   28602     -21
do_line                                              121      91     -30
patch_main                                          2086    1923    -163
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-214)           Total: -214 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-06-19 01:40:31 +02:00
parent 5331e382f7
commit 416e978ce8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editors/patch.c
View File

@ -15,22 +15,23 @@
* -D define wrap #ifdef and #ifndef around changes
* -o outfile output here instead of in place
* -r rejectfile write rejected hunks to this file
* --dry-run (regression!)
*
* -f force (no questions asked)
* -F fuzz (number, default 2)
* [file] which file to patch
*/
//applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_PATCH) += patch.o
//config:config PATCH
//config: bool "patch"
//config: default y
//config: help
//config: Apply a unified diff formatted patch.
//applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_PATCH) += patch.o
//usage:#define patch_trivial_usage
//usage: "[OPTIONS] [ORIGFILE [PATCHFILE]]"
//usage:#define patch_full_usage "\n\n"
@ -39,7 +40,7 @@
//usage: "\n -i,--input DIFF Read DIFF instead of stdin"
//usage: "\n -R,--reverse Reverse patch"
//usage: "\n -N,--forward Ignore already applied patches"
//usage: "\n --dry-run Don't actually change files"
/*usage: "\n --dry-run Don't actually change files" - TODO */
//usage: "\n -E,--remove-empty-files Remove output files if they become empty"
//usage: )
//usage: IF_NOT_LONG_OPTS(
@ -49,6 +50,8 @@
//usage: "\n -N Ignore already applied patches"
//usage: "\n -E Remove output files if they become empty"
//usage: )
/* -u "interpret as unified diff" is supported but not documented: this info is not useful for --help */
/* -x "debug" is supported but does nothing */
//usage:
//usage:#define patch_example_usage
//usage: "$ patch -p1 < example.diff\n"
@ -130,8 +133,8 @@ struct globals {
#define FLAG_INPUT (1 << 3)
#define FLAG_IGNORE (1 << 4)
#define FLAG_RMEMPTY (1 << 5)
//non-standard:
#define FLAG_DEBUG (1 << 6)
/* Enable this bit and use -x for debug output: */
#define FLAG_DEBUG (0 << 6)
// Dispose of a line of input, either by writing it out or discarding it.