projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7583d8
)
diff: comment - explain what happens when hunk fails to apply
author
Denis Vlasenko
<vda.linux@googlemail.com>
Sun, 17 Dec 2006 00:49:56 +0000
(
00:49
-0000)
committer
Denis Vlasenko
<vda.linux@googlemail.com>
Sun, 17 Dec 2006 00:49:56 +0000
(
00:49
-0000)
editors/patch.c
patch
|
blob
|
history
diff --git
a/editors/patch.c
b/editors/patch.c
index d13b06a8380eded400bd7f2fa969f3c6d13b0f25..f8d7605c0d4ab707766a9dedd223b7546e035c8d 100644
(file)
--- a/
editors/patch.c
+++ b/
editors/patch.c
@@
-15,9
+15,8
@@
*
* Issues
* - Non-interactive
- * - Patches must apply cleanly or
the hunk
will fail.
+ * - Patches must apply cleanly or
patch (not just one hunk)
will fail.
* - Reject file isnt saved
- * -
*/
#include <getopt.h>
@@
-214,6
+213,8
@@
int patch_main(int argc, char **argv)
bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
hunk_error++;
free(patch_line);
+ /* Probably need to find next hunk, etc... */
+ /* but for now we just bail out */
patch_line = NULL;
break;
}