aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-17 00:49:56 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-17 00:49:56 +0000
commit0a10da29a7075dc5d6909e76da5239e2952ac662 (patch)
tree99d92d79790ef7519c7da322253a40fdee823b54
parentf7583d89b07f8dd4510d5383d9ce17ac4f8e699f (diff)
downloadbusybox-w32-0a10da29a7075dc5d6909e76da5239e2952ac662.tar.gz
busybox-w32-0a10da29a7075dc5d6909e76da5239e2952ac662.tar.bz2
busybox-w32-0a10da29a7075dc5d6909e76da5239e2952ac662.zip
diff: comment - explain what happens when hunk fails to apply
-rw-r--r--editors/patch.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/patch.c b/editors/patch.c
index d13b06a83..f8d7605c0 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -15,9 +15,8 @@
15 * 15 *
16 * Issues 16 * Issues
17 * - Non-interactive 17 * - Non-interactive
18 * - Patches must apply cleanly or the hunk will fail. 18 * - Patches must apply cleanly or patch (not just one hunk) will fail.
19 * - Reject file isnt saved 19 * - Reject file isnt saved
20 * -
21 */ 20 */
22 21
23#include <getopt.h> 22#include <getopt.h>
@@ -214,6 +213,8 @@ int patch_main(int argc, char **argv)
214 bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start); 213 bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
215 hunk_error++; 214 hunk_error++;
216 free(patch_line); 215 free(patch_line);
216 /* Probably need to find next hunk, etc... */
217 /* but for now we just bail out */
217 patch_line = NULL; 218 patch_line = NULL;
218 break; 219 break;
219 } 220 }