* things are flags, where -1 means "don't know yet".
*/
static int linenr = 1;
-static int old_mode, new_mode;
-static char *old_name, *new_name, *def_name;
-static int is_rename, is_copy, is_new, is_delete;
+static char *def_name = NULL;
+
+struct fragment {
+ unsigned long oldpos, oldlines;
+ unsigned long newpos, newlines;
+ const char *patch;
+ int size;
+ struct fragment *next;
+};
+
+struct patch {
+ char *new_name, *old_name;
+ unsigned int old_mode, new_mode;
+ int is_rename, is_copy, is_new, is_delete;
+ struct fragment *fragments;
+ struct patch *next;
+};
#define CHUNKSIZE (8192)
#define SLOP (16)
return !memcmp("/dev/null", str, 9) && isspace(str[9]);
}
-static char * find_name(const char *line, char *def, int p_value)
+#define TERM_EXIST 1
+#define TERM_SPACE 2
+#define TERM_TAB 4
+
+static int name_terminate(const char *name, int namelen, int c, int terminate)
+{
+ if (c == ' ' && !(terminate & TERM_SPACE))
+ return 0;
+ if (c == '\t' && !(terminate & TERM_TAB))
+ return 0;
+
+ /*
+ * Do we want an existing name? Return false and
+ * continue if it's not there.
+ */
+ if (terminate & TERM_EXIST)
+ return cache_name_pos(name, namelen) >= 0;
+
+ return 1;
+}
+
+static char * find_name(const char *line, char *def, int p_value, int terminate)
{
int len;
const char *start = line;
for (;;) {
char c = *line;
- if (isspace(c))
- break;
+
+ if (isspace(c)) {
+ if (c == '\n')
+ break;
+ if (name_terminate(start, line-start, c, terminate))
+ break;
+ }
line++;
if (c == '/' && !--p_value)
start = line;
* Get the name etc info from the --/+++ lines of a traditional patch header
*
* NOTE! This hardcodes "-p1" behaviour in filename detection.
+ *
+ * FIXME! The end-of-filename heuristics are kind of screwy. For existing
+ * files, we can happily check the index for a match, but for creating a
+ * new file we should try to match whatever "patch" does. I have no idea.
*/
-static int parse_traditional_patch(const char *first, const char *second)
+static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
{
int p_value = 1;
char *name;
first += 4; // skip "--- "
second += 4; // skip "+++ "
if (is_dev_null(first)) {
- is_new = 1;
- name = find_name(second, def_name, p_value);
+ patch->is_new = 1;
+ patch->is_delete = 0;
+ name = find_name(second, def_name, p_value, TERM_SPACE | TERM_TAB);
+ patch->new_name = name;
} else if (is_dev_null(second)) {
- is_delete = 1;
- name = find_name(first, def_name, p_value);
+ patch->is_new = 0;
+ patch->is_delete = 1;
+ name = find_name(first, def_name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB);
+ patch->old_name = name;
} else {
- name = find_name(first, def_name, p_value);
- name = find_name(second, name, p_value);
+ name = find_name(first, def_name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB);
+ name = find_name(second, name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB);
+ patch->old_name = patch->new_name = name;
}
if (!name)
die("unable to find filename in patch at line %d", linenr);
- old_name = name;
- new_name = name;
}
-static int gitdiff_hdrend(const char *line)
+static int gitdiff_hdrend(const char *line, struct patch *patch)
{
return -1;
}
-static int gitdiff_oldname(const char *line)
+/*
+ * We're anal about diff header consistency, to make
+ * sure that we don't end up having strange ambiguous
+ * patches floating around.
+ *
+ * As a result, gitdiff_{old|new}name() will check
+ * their names against any previous information, just
+ * to make sure..
+ */
+static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
+{
+ int len;
+ const char *name;
+
+ if (!orig_name && !isnull)
+ return find_name(line, NULL, 1, 0);
+
+ name = "/dev/null";
+ len = 9;
+ if (orig_name) {
+ name = orig_name;
+ len = strlen(name);
+ if (isnull)
+ die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
+ }
+
+ if (*name == '/')
+ goto absolute_path;
+
+ for (;;) {
+ char c = *line++;
+ if (c == '\n')
+ break;
+ if (c != '/')
+ continue;
+absolute_path:
+ if (memcmp(line, name, len) || line[len] != '\n')
+ break;
+ return orig_name;
+ }
+ die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
+ return NULL;
+}
+
+static int gitdiff_oldname(const char *line, struct patch *patch)
{
- if (!old_name)
- old_name = find_name(line, NULL, 1);
+ patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
return 0;
}
-static int gitdiff_newname(const char *line)
+static int gitdiff_newname(const char *line, struct patch *patch)
{
- if (!new_name)
- new_name = find_name(line, NULL, 1);
+ patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
return 0;
}
-static int gitdiff_oldmode(const char *line)
+static int gitdiff_oldmode(const char *line, struct patch *patch)
{
- old_mode = strtoul(line, NULL, 8);
+ patch->old_mode = strtoul(line, NULL, 8);
return 0;
}
-static int gitdiff_newmode(const char *line)
+static int gitdiff_newmode(const char *line, struct patch *patch)
{
- new_mode = strtoul(line, NULL, 8);
+ patch->new_mode = strtoul(line, NULL, 8);
return 0;
}
-static int gitdiff_delete(const char *line)
+static int gitdiff_delete(const char *line, struct patch *patch)
{
- is_delete = 1;
- return gitdiff_oldmode(line);
+ patch->is_delete = 1;
+ return gitdiff_oldmode(line, patch);
}
-static int gitdiff_newfile(const char *line)
+static int gitdiff_newfile(const char *line, struct patch *patch)
{
- is_new = 1;
- return gitdiff_newmode(line);
+ patch->is_new = 1;
+ return gitdiff_newmode(line, patch);
}
-static int gitdiff_copysrc(const char *line)
+static int gitdiff_copysrc(const char *line, struct patch *patch)
{
- is_copy = 1;
- old_name = find_name(line, NULL, 0);
+ patch->is_copy = 1;
+ patch->old_name = find_name(line, NULL, 0, 0);
return 0;
}
-static int gitdiff_copydst(const char *line)
+static int gitdiff_copydst(const char *line, struct patch *patch)
{
- is_copy = 1;
- new_name = find_name(line, NULL, 0);
+ patch->is_copy = 1;
+ patch->new_name = find_name(line, NULL, 0, 0);
return 0;
}
-static int gitdiff_renamesrc(const char *line)
+static int gitdiff_renamesrc(const char *line, struct patch *patch)
{
- is_rename = 1;
- old_name = find_name(line, NULL, 0);
+ patch->is_rename = 1;
+ patch->old_name = find_name(line, NULL, 0, 0);
return 0;
}
-static int gitdiff_renamedst(const char *line)
+static int gitdiff_renamedst(const char *line, struct patch *patch)
{
- is_rename = 1;
- new_name = find_name(line, NULL, 0);
+ patch->is_rename = 1;
+ patch->new_name = find_name(line, NULL, 0, 0);
return 0;
}
-static int gitdiff_similarity(const char *line)
+static int gitdiff_similarity(const char *line, struct patch *patch)
{
return 0;
}
+/*
+ * This is normal for a diff that doesn't change anything: we'll fall through
+ * into the next diff. Tell the parser to break out.
+ */
+static int gitdiff_unrecognized(const char *line, struct patch *patch)
+{
+ return -1;
+}
+
/* Verify that we recognize the lines following a git header */
-static int parse_git_header(char *line, int len, unsigned int size)
+static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
{
unsigned long offset;
/* A git diff has explicit new/delete information, so we don't guess */
- is_new = 0;
- is_delete = 0;
+ patch->is_new = 0;
+ patch->is_delete = 0;
line += len;
size -= len;
for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
static const struct opentry {
const char *str;
- int (*fn)(const char *);
+ int (*fn)(const char *, struct patch *);
} optable[] = {
{ "@@ -", gitdiff_hdrend },
{ "--- ", gitdiff_oldname },
{ "rename from ", gitdiff_renamesrc },
{ "rename to ", gitdiff_renamedst },
{ "similarity index ", gitdiff_similarity },
+ { "", gitdiff_unrecognized },
};
int i;
int oplen = strlen(p->str);
if (len < oplen || memcmp(p->str, line, oplen))
continue;
- if (p->fn(line + oplen) < 0)
+ if (p->fn(line + oplen, patch) < 0)
return offset;
+ break;
}
}
* Parse a unified diff fragment header of the
* form "@@ -a,b +c,d @@"
*/
-static int parse_fragment_header(char *line, int len, unsigned long *pos)
+static int parse_fragment_header(char *line, int len, struct fragment *fragment)
{
int offset;
return -1;
/* Figure out the number of lines in a fragment */
- offset = parse_num(line, len, 4, ",", pos);
- offset = parse_num(line, len, offset, " +", pos+1);
- offset = parse_num(line, len, offset, ",", pos+2);
- offset = parse_num(line, len, offset, " @@", pos+3);
+ offset = parse_num(line, len, 4, ",", &fragment->oldpos);
+ offset = parse_num(line, len, offset, " +", &fragment->oldlines);
+ offset = parse_num(line, len, offset, ",", &fragment->newpos);
+ offset = parse_num(line, len, offset, " @@", &fragment->newlines);
return offset;
}
-static int find_header(char *line, unsigned long size, int *hdrsize)
+static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
{
unsigned long offset, len;
- is_rename = is_copy = 0;
- is_new = is_delete = -1;
- old_mode = new_mode = -1;
- def_name = old_name = new_name = NULL;
+ patch->is_rename = patch->is_copy = 0;
+ patch->is_new = patch->is_delete = -1;
+ patch->old_mode = patch->new_mode = 0;
+ patch->old_name = patch->new_name = NULL;
for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
unsigned long nextlen;
* patch has become corrupted/broken up.
*/
if (!memcmp("@@ -", line, 4)) {
- unsigned long pos[4];
- if (parse_fragment_header(line, len, pos) < 0)
+ struct fragment dummy;
+ if (parse_fragment_header(line, len, &dummy) < 0)
continue;
error("patch fragment without header at line %d: %.*s", linenr, len-1, line);
}
* or mode change, so we handle that specially
*/
if (!memcmp("diff --git ", line, 11)) {
- int git_hdr_len = parse_git_header(line, len, size);
+ int git_hdr_len = parse_git_header(line, len, size, patch);
if (git_hdr_len < 0)
continue;
continue;
/* Ok, we'll consider it a patch */
- parse_traditional_patch(line, line+len);
+ parse_traditional_patch(line, line+len, patch);
*hdrsize = len + nextlen;
linenr += 2;
return offset;
* part of a patch, and a "---" that starts the next
* patch is to look at the line counts..
*/
-static int apply_fragment(char *line, unsigned long size)
+static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
{
int len = linelen(line, size), offset;
unsigned long pos[4], oldlines, newlines;
- offset = parse_fragment_header(line, len, pos);
+ offset = parse_fragment_header(line, len, fragment);
if (offset < 0)
return -1;
- oldlines = pos[1];
- newlines = pos[3];
+ oldlines = fragment->oldlines;
+ newlines = fragment->newlines;
- if (is_new < 0 && (pos[0] || oldlines))
- is_new = 0;
- if (is_delete < 0 && (pos[1] || newlines))
- is_delete = 0;
+ if (patch->is_new < 0 && (pos[0] || oldlines))
+ patch->is_new = 0;
+ if (patch->is_delete < 0 && (pos[1] || newlines))
+ patch->is_delete = 0;
/* Parse the thing.. */
line += len;
return offset;
}
-static int apply_single_patch(char *line, unsigned long size)
+static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
{
unsigned long offset = 0;
+ struct fragment **fragp = &patch->fragments;
while (size > 4 && !memcmp(line, "@@ -", 4)) {
- int len = apply_fragment(line, size);
+ struct fragment *fragment;
+ int len;
+
+ fragment = xmalloc(sizeof(*fragment));
+ memset(fragment, 0, sizeof(*fragment));
+ len = parse_fragment(line, size, patch, fragment);
if (len <= 0)
die("corrupt patch at line %d", linenr);
-printf("applying fragment:\n%.*s\n\n", len, line);
+ fragment->patch = line;
+ fragment->size = len;
+
+ *fragp = fragment;
+ fragp = &fragment->next;
offset += len;
line += len;
return offset;
}
-static int apply_chunk(char *buffer, unsigned long size)
+static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
{
int hdrsize, patchsize;
- int offset = find_header(buffer, size, &hdrsize);
- char *header, *patch;
+ int offset = find_header(buffer, size, &hdrsize, patch);
if (offset < 0)
return offset;
- header = buffer + offset;
-printf("Found header:\n%.*s\n\n", hdrsize, header);
-printf("Rename: %d\n", is_rename);
-printf("Copy: %d\n", is_copy);
-printf("New: %d\n", is_new);
-printf("Delete: %d\n", is_delete);
-printf("Mode: %o->%o\n", old_mode, new_mode);
-printf("Name: '%s'->'%s'\n", old_name, new_name);
-
- patch = header + hdrsize;
- patchsize = apply_single_patch(patch, size - offset - hdrsize);
+ patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
return offset + hdrsize + patchsize;
}
+static void apply_patch_list(struct patch *patch)
+{
+ if (!patch)
+ die("no patch found");
+ do {
+ const char *old_name = patch->old_name;
+ const char *new_name = patch->new_name;
+ struct fragment *frag;
+
+ if (old_name) {
+ if (cache_name_pos(old_name, strlen(old_name)) < 0)
+ die("file %s does not exist", old_name);
+ if (patch->is_new < 0)
+ patch->is_new = 0;
+ }
+ if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
+ if (cache_name_pos(new_name, strlen(new_name)) >= 0)
+ die("file %s already exists", new_name);
+ }
+
+ printf("Applying patch to %s\n", new_name);
+ printf(" new=%d delete=%d copy=%d rename=%d\n",
+ patch->is_new, patch->is_delete, patch->is_copy, patch->is_rename);
+ if (patch->old_mode != patch->new_mode)
+ printf(" %o->%o\n", patch->old_mode, patch->new_mode);
+ frag = patch->fragments;
+ while (frag) {
+ printf("Fragment %lu,%lu -> %lu,%lu\n%.*s",
+ frag->oldpos, frag->oldlines,
+ frag->newpos, frag->newlines,
+ frag->size, frag->patch);
+ frag = frag->next;
+ }
+
+ } while ((patch = patch->next) != NULL);
+}
+
static int apply_patch(int fd)
{
unsigned long offset, size;
char *buffer = read_patch_file(fd, &size);
+ struct patch *list = NULL, **listp = &list;
if (!buffer)
return -1;
offset = 0;
while (size > 0) {
- int nr = apply_chunk(buffer + offset, size);
+ struct patch *patch;
+ int nr;
+
+ patch = xmalloc(sizeof(*patch));
+ memset(patch, 0, sizeof(*patch));
+ nr = parse_chunk(buffer + offset, size, patch);
if (nr < 0)
break;
+ *listp = patch;
+ listp = &patch->next;
offset += nr;
size -= nr;
}
+
+ apply_patch_list(list);
+
free(buffer);
return 0;
}
int main(int argc, char **argv)
{
int i;
+ int read_stdin = 1;
if (read_cache() < 0)
die("unable to read index file");
if (!strcmp(arg, "-")) {
apply_patch(0);
+ read_stdin = 0;
continue;
}
if (!strcmp(arg, "--no-merge")) {
fd = open(arg, O_RDONLY);
if (fd < 0)
usage(apply_usage);
+ read_stdin = 0;
apply_patch(fd);
close(fd);
}
+ if (read_stdin)
+ apply_patch(0);
return 0;
}