aboutsummaryrefslogtreecommitdiff
path: root/editors/patch.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-09-06 04:31:16 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-09-06 04:31:16 +0200
commited058016bf8fc98271de2e58bfb650de9e9d304d (patch)
treeb6554880a7224a86c27429aaebfa6a5b16349b59 /editors/patch.c
parentcc272b06eefb87030bb85b686abdbc22b5ed1c34 (diff)
downloadbusybox-w32-1_19_2.tar.gz
busybox-w32-1_19_2.tar.bz2
busybox-w32-1_19_2.zip
Apply post-1.19.1 patches, bump version to 1.19.21_19_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors/patch.c')
-rw-r--r--editors/patch.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/editors/patch.c b/editors/patch.c
index ec5b8e7ad..1f2a49b66 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -70,8 +70,7 @@ struct double_list {
70 70
71// Free all the elements of a linked list 71// Free all the elements of a linked list
72// Call freeit() on each element before freeing it. 72// Call freeit() on each element before freeing it.
73static 73static void dlist_free(struct double_list *list, void (*freeit)(void *data))
74void dlist_free(struct double_list *list, void (*freeit)(void *data))
75{ 74{
76 while (list) { 75 while (list) {
77 void *pop = list; 76 void *pop = list;
@@ -83,8 +82,7 @@ void dlist_free(struct double_list *list, void (*freeit)(void *data))
83} 82}
84 83
85// Add an entry before "list" element in (circular) doubly linked list 84// Add an entry before "list" element in (circular) doubly linked list
86static 85static struct double_list *dlist_add(struct double_list **list, char *data)
87struct double_list *dlist_add(struct double_list **list, char *data)
88{ 86{
89 struct double_list *llist; 87 struct double_list *llist;
90 struct double_list *line = xmalloc(sizeof(*line)); 88 struct double_list *line = xmalloc(sizeof(*line));
@@ -232,7 +230,7 @@ static int apply_one_hunk(void)
232 else matcheof = 0; 230 else matcheof = 0;
233 if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data); 231 if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
234 } 232 }
235 matcheof = matcheof < TT.context; 233 matcheof = !matcheof || matcheof < TT.context;
236 234
237 if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N'); 235 if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
238 236