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

patch: add -N and a test for it (fails for now)

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-08-16 01:33:57 +02:00
parent 6373bb7740
commit a4160e15ec
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editors/patch.c
View File

@ -245,14 +245,16 @@ struct globals {
//bbox had: "p:i:RN" //bbox had: "p:i:RN"
#define FLAG_STR "Rup:i:x" #define FLAG_STR "Rup:i:Nx"
/* FLAG_REVERSE must be == 1! Code uses this fact. */ /* FLAG_REVERSE must be == 1! Code uses this fact. */
#define FLAG_REVERSE (1 << 0) #define FLAG_REVERSE (1 << 0)
#define FLAG_u (1 << 1) #define FLAG_u (1 << 1)
#define FLAG_PATHLEN (1 << 2) #define FLAG_PATHLEN (1 << 2)
#define FLAG_INPUT (1 << 3) #define FLAG_INPUT (1 << 3)
// -N: not supported yet
#define FLAG_IGNORE (1 << 4)
//non-standard: //non-standard:
#define FLAG_DEBUG (1 << 4) #define FLAG_DEBUG (1 << 5)
// Dispose of a line of input, either by writing it out or discarding it. // Dispose of a line of input, either by writing it out or discarding it.

27
testsuite/patch.tests
View File

@ -4,7 +4,7 @@
. ./testing.sh . ./testing.sh
# testing "test name" "options" "expected result" "file input" "stdin" # testing "test name" "command(s)" "expected result" "file input" "stdin"
testing "patch with old_file == new_file" \ testing "patch with old_file == new_file" \
'patch 2>&1; echo $?; cat input' \ 'patch 2>&1; echo $?; cat input' \
@ -126,6 +126,31 @@ abc
+456 +456
" \ " \
# testing "test name" "command(s)" "expected result" "file input" "stdin"
testing "patch -N ignores already applied hunk" \
'patch -N 2>&1; echo $?; cat input' \
"\
patching file input
0
abc
def
123
" \
"\
abc
def
123
" \
"\
--- input
+++ input
@@ -1,2 +1,3 @@
abc
+def
123
" \
rm input.orig 2>/dev/null rm input.orig 2>/dev/null
exit $FAILCOUNT exit $FAILCOUNT