2 * wiggle - apply rejected patches
4 * Copyright (C) 2003 Neil Brown <neilb@cse.unsw.edu.au>
5 * Copyright (C) 2010-2013 Neil Brown <neilb@suse.de>
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
18 * You should have received a copy of the GNU General Public License
19 * along with this program.
22 * Email: <neilb@suse.de>
26 * split patch or merge files.
32 /* skip 'cp' past the new '\n', or all the way to 'end' */
33 static void skip_eol(char **cp, char *end)
36 while (c < end && *c != '\n')
43 /* copy one line, or to end, from 'cp' into the stream, extending
46 static void copyline(struct stream *s, char **cp, char *end)
49 char *to = s->body+s->len;
51 while (from < end && *from != '\n')
59 int wiggle_split_patch(struct stream f, struct stream *f1, struct stream *f2)
65 int acnt = 0, bcnt = 0;
68 char before[100], after[100];
71 f1->body = f2->body = NULL;
73 r1.body = wiggle_xmalloc(f.len);
74 r2.body = wiggle_xmalloc(f.len);
83 * 1 first half of context
84 * 2 second half of context
90 if (sscanf(cp, "@@ -%99s +%99s @@%99[^\n]", before, after, func) >= 2) {
92 if (sscanf(before, "%d,%d", &a, &b) == 2)
94 else if (sscanf(before, "%d", &a) == 1)
99 if (sscanf(after, "%d,%d", &c, &d) == 2)
101 else if (sscanf(after, "%d", &c) == 1)
109 } else if (sscanf(cp, "*** %d,%d ****", &a, &b) == 2) {
112 } else if (sscanf(cp, "--- %d,%d ----", &c, &d) == 2) {
116 sscanf(cp, "***************%99[^\n]", func);
119 if (state == 1 || state == 3) {
122 /* Reserve enough space for 3 integers separated
123 * by a single space, and prefixed and terminated
124 * with a null character.
129 slen = sprintf(buf+1, "%5d %5d %5d", chunks, a, acnt)+1;
130 memcpy(r1.body+r1.len, buf, slen);
136 r1.body[r1.len++] = ' ';
137 strcpy(r1.body + r1.len, f);
140 r1.body[r1.len++] = '\n';
141 r1.body[r1.len++] = '\0';
143 if (state == 2 || state == 3) {
145 /* Reserve enough space for 3 integers separated
146 * by a single space, prefixed with a null character
147 * and terminated with a new line and null character.
151 slen = sprintf(buf+1, "%5d %5d %5d\n", chunks, c, bcnt)+2;
152 memcpy(r2.body+r2.len, buf, slen);
159 if ((*cp == ' ' || *cp == '!' || *cp == '-' || *cp == '+')
162 copyline(&r1, &cp, end);
167 fprintf(stderr, "%s: bad context patch at line %d\n",
173 if ((*cp == ' ' || *cp == '!' || *cp == '-' || *cp == '+')
176 copyline(&r2, &cp, end);
181 fprintf(stderr, "%s: bad context patch/2 at line %d\n",
191 copyline(&r1, &cp, end);
192 copyline(&r2, &cp2, end);
194 } else if (*cp == '-') {
196 copyline(&r1, &cp, end);
198 } else if (*cp == '+') {
200 copyline(&r2, &cp, end);
202 } else if (*cp == '\n') {
203 /* Empty line - treat like " \n" - a blank line in both */
205 copyline(&r1, &cp, end);
206 copyline(&r2, &cp2, end);
209 fprintf(stderr, "%s: bad unified patch at line %d\n",
213 if (acnt <= 0 && bcnt <= 0)
218 if (r1.len > f.len || r2.len > f.len)
226 * extract parts of a "diff3 -m" or "wiggle -m" output
228 int wiggle_split_merge(struct stream f, struct stream *f1, struct stream *f2, struct stream *f3)
232 struct stream r1, r2, r3;
236 r1.body = wiggle_xmalloc(f.len);
237 r2.body = wiggle_xmalloc(f.len);
238 r3.body = wiggle_xmalloc(f.len);
239 r1.len = r2.len = r3.len = 0;
246 * 1 in file 1 of conflict
247 * 2 in file 2 of conflict
248 * 3 in file 3 of conflict
249 * 4 in file 2 but expecting 1/3 next
256 strncmp(cp, "<<<<<<<", 7) == 0 &&
257 (cp[7] == ' ' || cp[7] == '\n')
262 /* diff3 will do something a bit strange in
263 * the 1st and 3rd sections are the same.
270 * Without a ||||||| at all.
271 * so to know if we are in '1' or '2', skip forward
277 (peek[7] == ' ' || peek[7] == '\n')) {
278 if (strncmp(peek, "|||||||", 7) == 0 ||
279 strncmp(peek, ">>>>>>>", 7) == 0)
281 else if (strncmp(peek, "=======", 7) == 0) {
286 skip_eol(&peek, end);
290 copyline(&r1, &cp2, end);
292 copyline(&r2, &cp2, end);
293 copyline(&r3, &cp, end);
298 strncmp(cp, "|||||||", 7) == 0 &&
299 (cp[7] == ' ' || cp[7] == '\n')
304 copyline(&r1, &cp, end);
308 strncmp(cp, "=======", 7) == 0 &&
309 (cp[7] == ' ' || cp[7] == '\n')
314 copyline(&r2, &cp, end);
318 strncmp(cp, ">>>>>>>", 7) == 0 &&
319 (cp[7] == ' ' || cp[7] == '\n')
324 copyline(&r3, &cp, end);
328 strncmp(cp, "=======", 7) == 0 &&
329 (cp[7] == ' ' || cp[7] == '\n')
334 copyline(&r2, &cp, end);
338 strncmp(cp, ">>>>>>>", 7) == 0 &&
339 (cp[7] == ' ' || cp[7] == '\n')
345 copyline(&r1, &t, end);
346 copyline(&r3, &cp, end);