2005-05-23 19:52:17 +02:00
|
|
|
/*
|
|
|
|
* apply.c
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*
|
|
|
|
* This applies patches on top of some (arbitrary) version of the SCM.
|
|
|
|
*
|
|
|
|
* NOTE! It does all its work in the index file, and only cares about
|
|
|
|
* the files in the working directory if you tell it to "merge" the
|
|
|
|
* patch apply.
|
|
|
|
*
|
|
|
|
* Even when merging it always takes the source from the index, and
|
|
|
|
* uses the working tree as a "branch" for a 3-way merge.
|
|
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
|
|
|
|
// We default to the merge behaviour, since that's what most people would
|
|
|
|
// expect
|
|
|
|
static int merge_patch = 1;
|
|
|
|
static const char apply_usage[] = "git-apply <patch>";
|
|
|
|
|
2005-05-24 01:09:09 +02:00
|
|
|
/*
|
|
|
|
* Various "current state", notably line numbers and what
|
|
|
|
* file (and how) we're patching right now.. The "is_xxxx"
|
|
|
|
* things are flags, where -1 means "don't know yet".
|
|
|
|
*/
|
2005-05-23 23:38:49 +02:00
|
|
|
static int linenr = 1;
|
2005-05-26 19:23:51 +02:00
|
|
|
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;
|
|
|
|
};
|
2005-05-23 23:38:49 +02:00
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
#define CHUNKSIZE (8192)
|
2005-05-24 01:09:09 +02:00
|
|
|
#define SLOP (16)
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
static void *read_patch_file(int fd, unsigned long *sizep)
|
|
|
|
{
|
|
|
|
unsigned long size = 0, alloc = CHUNKSIZE;
|
|
|
|
void *buffer = xmalloc(alloc);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
int nr = alloc - size;
|
|
|
|
if (nr < 1024) {
|
|
|
|
alloc += CHUNKSIZE;
|
|
|
|
buffer = xrealloc(buffer, alloc);
|
|
|
|
nr = alloc - size;
|
|
|
|
}
|
|
|
|
nr = read(fd, buffer + size, nr);
|
|
|
|
if (!nr)
|
|
|
|
break;
|
|
|
|
if (nr < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
continue;
|
|
|
|
die("git-apply: read returned %s", strerror(errno));
|
|
|
|
}
|
|
|
|
size += nr;
|
|
|
|
}
|
|
|
|
*sizep = size;
|
2005-05-24 01:09:09 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure that we have some slop in the buffer
|
|
|
|
* so that we can do speculative "memcmp" etc, and
|
|
|
|
* see to it that it is NUL-filled.
|
|
|
|
*/
|
|
|
|
if (alloc < size + SLOP)
|
|
|
|
buffer = xrealloc(buffer, size + SLOP);
|
|
|
|
memset(buffer + size, 0, SLOP);
|
2005-05-23 19:52:17 +02:00
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long linelen(char *buffer, unsigned long size)
|
|
|
|
{
|
|
|
|
unsigned long len = 0;
|
|
|
|
while (size--) {
|
|
|
|
len++;
|
|
|
|
if (*buffer++ == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2005-05-24 01:09:09 +02:00
|
|
|
static int is_dev_null(const char *str)
|
|
|
|
{
|
|
|
|
return !memcmp("/dev/null", str, 9) && isspace(str[9]);
|
|
|
|
}
|
|
|
|
|
2005-05-24 04:13:55 +02:00
|
|
|
#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)
|
2005-05-23 19:52:17 +02:00
|
|
|
{
|
2005-05-24 01:09:09 +02:00
|
|
|
int len;
|
|
|
|
const char *start = line;
|
|
|
|
char *name;
|
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
for (;;) {
|
2005-05-24 01:09:09 +02:00
|
|
|
char c = *line;
|
2005-05-24 04:13:55 +02:00
|
|
|
|
|
|
|
if (isspace(c)) {
|
|
|
|
if (c == '\n')
|
|
|
|
break;
|
|
|
|
if (name_terminate(start, line-start, c, terminate))
|
|
|
|
break;
|
|
|
|
}
|
2005-05-24 01:09:09 +02:00
|
|
|
line++;
|
|
|
|
if (c == '/' && !--p_value)
|
|
|
|
start = line;
|
|
|
|
}
|
|
|
|
if (!start)
|
|
|
|
return def;
|
|
|
|
len = line - start;
|
|
|
|
if (!len)
|
|
|
|
return def;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Generally we prefer the shorter name, especially
|
|
|
|
* if the other one is just a variation of that with
|
|
|
|
* something else tacked on to the end (ie "file.orig"
|
|
|
|
* or "file~").
|
|
|
|
*/
|
|
|
|
if (def) {
|
|
|
|
int deflen = strlen(def);
|
|
|
|
if (deflen < len && !strncmp(start, def, deflen))
|
|
|
|
return def;
|
2005-05-23 19:52:17 +02:00
|
|
|
}
|
2005-05-24 01:09:09 +02:00
|
|
|
|
|
|
|
name = xmalloc(len + 1);
|
|
|
|
memcpy(name, start, len);
|
|
|
|
name[len] = 0;
|
|
|
|
free(def);
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the name etc info from the --/+++ lines of a traditional patch header
|
|
|
|
*
|
|
|
|
* NOTE! This hardcodes "-p1" behaviour in filename detection.
|
2005-05-24 04:13:55 +02:00
|
|
|
*
|
|
|
|
* 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.
|
2005-05-24 01:09:09 +02:00
|
|
|
*/
|
2005-05-26 19:23:51 +02:00
|
|
|
static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
|
|
|
int p_value = 1;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
first += 4; // skip "--- "
|
|
|
|
second += 4; // skip "+++ "
|
|
|
|
if (is_dev_null(first)) {
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_new = 1;
|
|
|
|
patch->is_delete = 0;
|
2005-05-24 04:13:55 +02:00
|
|
|
name = find_name(second, def_name, p_value, TERM_SPACE | TERM_TAB);
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->new_name = name;
|
2005-05-24 01:09:09 +02:00
|
|
|
} else if (is_dev_null(second)) {
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_new = 0;
|
|
|
|
patch->is_delete = 1;
|
2005-05-24 04:13:55 +02:00
|
|
|
name = find_name(first, def_name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB);
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->old_name = name;
|
2005-05-24 01:09:09 +02:00
|
|
|
} else {
|
2005-05-24 04:13:55 +02:00
|
|
|
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);
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->old_name = patch->new_name = name;
|
2005-05-24 01:09:09 +02:00
|
|
|
}
|
|
|
|
if (!name)
|
|
|
|
die("unable to find filename in patch at line %d", linenr);
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_hdrend(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-05-24 04:54:55 +02:00
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_oldname(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_newname(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_oldmode(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->old_mode = strtoul(line, NULL, 8);
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_newmode(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->new_mode = strtoul(line, NULL, 8);
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_delete(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_delete = 1;
|
|
|
|
return gitdiff_oldmode(line, patch);
|
2005-05-24 01:09:09 +02:00
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_newfile(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_new = 1;
|
|
|
|
return gitdiff_newmode(line, patch);
|
2005-05-24 01:09:09 +02:00
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_copysrc(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_copy = 1;
|
|
|
|
patch->old_name = find_name(line, NULL, 0, 0);
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_copydst(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_copy = 1;
|
|
|
|
patch->new_name = find_name(line, NULL, 0, 0);
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_renamesrc(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_rename = 1;
|
|
|
|
patch->old_name = find_name(line, NULL, 0, 0);
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_renamedst(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_rename = 1;
|
|
|
|
patch->new_name = find_name(line, NULL, 0, 0);
|
2005-05-24 01:09:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_similarity(const char *line, struct patch *patch)
|
2005-05-24 01:09:09 +02:00
|
|
|
{
|
|
|
|
return 0;
|
2005-05-23 19:52:17 +02:00
|
|
|
}
|
|
|
|
|
2005-05-24 04:13:55 +02:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2005-05-26 19:23:51 +02:00
|
|
|
static int gitdiff_unrecognized(const char *line, struct patch *patch)
|
2005-05-24 04:13:55 +02:00
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
/* Verify that we recognize the lines following a git header */
|
2005-05-26 19:23:51 +02:00
|
|
|
static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
|
2005-05-23 19:52:17 +02:00
|
|
|
{
|
2005-05-24 01:09:09 +02:00
|
|
|
unsigned long offset;
|
|
|
|
|
|
|
|
/* A git diff has explicit new/delete information, so we don't guess */
|
2005-05-26 19:23:51 +02:00
|
|
|
patch->is_new = 0;
|
|
|
|
patch->is_delete = 0;
|
2005-05-24 01:09:09 +02:00
|
|
|
|
|
|
|
line += len;
|
|
|
|
size -= len;
|
|
|
|
linenr++;
|
|
|
|
for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
|
|
|
|
static const struct opentry {
|
|
|
|
const char *str;
|
2005-05-26 19:23:51 +02:00
|
|
|
int (*fn)(const char *, struct patch *);
|
2005-05-24 01:09:09 +02:00
|
|
|
} optable[] = {
|
|
|
|
{ "@@ -", gitdiff_hdrend },
|
|
|
|
{ "--- ", gitdiff_oldname },
|
|
|
|
{ "+++ ", gitdiff_newname },
|
|
|
|
{ "old mode ", gitdiff_oldmode },
|
|
|
|
{ "new mode ", gitdiff_newmode },
|
|
|
|
{ "deleted file mode ", gitdiff_delete },
|
|
|
|
{ "new file mode ", gitdiff_newfile },
|
|
|
|
{ "copy from ", gitdiff_copysrc },
|
|
|
|
{ "copy to ", gitdiff_copydst },
|
|
|
|
{ "rename from ", gitdiff_renamesrc },
|
|
|
|
{ "rename to ", gitdiff_renamedst },
|
|
|
|
{ "similarity index ", gitdiff_similarity },
|
2005-05-24 04:13:55 +02:00
|
|
|
{ "", gitdiff_unrecognized },
|
2005-05-24 01:09:09 +02:00
|
|
|
};
|
|
|
|
int i;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
len = linelen(line, size);
|
2005-05-24 01:09:09 +02:00
|
|
|
if (!len || line[len-1] != '\n')
|
2005-05-23 19:52:17 +02:00
|
|
|
break;
|
2005-05-24 01:09:09 +02:00
|
|
|
for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) {
|
|
|
|
const struct opentry *p = optable + i;
|
|
|
|
int oplen = strlen(p->str);
|
|
|
|
if (len < oplen || memcmp(p->str, line, oplen))
|
|
|
|
continue;
|
2005-05-26 19:23:51 +02:00
|
|
|
if (p->fn(line + oplen, patch) < 0)
|
2005-05-24 01:09:09 +02:00
|
|
|
return offset;
|
2005-05-24 04:13:55 +02:00
|
|
|
break;
|
2005-05-24 01:09:09 +02:00
|
|
|
}
|
2005-05-23 19:52:17 +02:00
|
|
|
}
|
|
|
|
|
2005-05-24 01:09:09 +02:00
|
|
|
return offset;
|
2005-05-23 19:52:17 +02:00
|
|
|
}
|
|
|
|
|
2005-05-23 23:38:49 +02:00
|
|
|
static int parse_num(const char *line, int len, int offset, const char *expect, unsigned long *p)
|
|
|
|
{
|
|
|
|
char *ptr;
|
|
|
|
int digits, ex;
|
|
|
|
|
|
|
|
if (offset < 0 || offset >= len)
|
|
|
|
return -1;
|
|
|
|
line += offset;
|
|
|
|
len -= offset;
|
|
|
|
|
|
|
|
if (!isdigit(*line))
|
|
|
|
return -1;
|
|
|
|
*p = strtoul(line, &ptr, 10);
|
|
|
|
|
|
|
|
digits = ptr - line;
|
|
|
|
|
|
|
|
offset += digits;
|
|
|
|
line += digits;
|
|
|
|
len -= digits;
|
|
|
|
|
|
|
|
ex = strlen(expect);
|
|
|
|
if (ex > len)
|
|
|
|
return -1;
|
|
|
|
if (memcmp(line, expect, ex))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return offset + ex;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a unified diff fragment header of the
|
|
|
|
* form "@@ -a,b +c,d @@"
|
|
|
|
*/
|
2005-05-26 19:23:51 +02:00
|
|
|
static int parse_fragment_header(char *line, int len, struct fragment *fragment)
|
2005-05-23 23:38:49 +02:00
|
|
|
{
|
|
|
|
int offset;
|
|
|
|
|
|
|
|
if (!len || line[len-1] != '\n')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Figure out the number of lines in a fragment */
|
2005-05-26 19:23:51 +02:00
|
|
|
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);
|
2005-05-23 23:38:49 +02:00
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
|
2005-05-23 19:52:17 +02:00
|
|
|
{
|
|
|
|
unsigned long offset, len;
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
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;
|
2005-05-23 23:38:49 +02:00
|
|
|
for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
|
2005-05-23 19:52:17 +02:00
|
|
|
unsigned long nextlen;
|
|
|
|
|
|
|
|
len = linelen(line, size);
|
|
|
|
if (!len)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Testing this early allows us to take a few shortcuts.. */
|
|
|
|
if (len < 6)
|
|
|
|
continue;
|
2005-05-23 23:38:49 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure we don't find any unconnected patch fragmants.
|
|
|
|
* That's a sign that we didn't find a header, and that a
|
|
|
|
* patch has become corrupted/broken up.
|
|
|
|
*/
|
|
|
|
if (!memcmp("@@ -", line, 4)) {
|
2005-05-26 19:23:51 +02:00
|
|
|
struct fragment dummy;
|
|
|
|
if (parse_fragment_header(line, len, &dummy) < 0)
|
2005-05-23 23:38:49 +02:00
|
|
|
continue;
|
|
|
|
error("patch fragment without header at line %d: %.*s", linenr, len-1, line);
|
|
|
|
}
|
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
if (size < len + 6)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Git patch? It might not have a real patch, just a rename
|
|
|
|
* or mode change, so we handle that specially
|
|
|
|
*/
|
|
|
|
if (!memcmp("diff --git ", line, 11)) {
|
2005-05-26 19:23:51 +02:00
|
|
|
int git_hdr_len = parse_git_header(line, len, size, patch);
|
2005-05-23 19:52:17 +02:00
|
|
|
if (git_hdr_len < 0)
|
|
|
|
continue;
|
|
|
|
|
2005-05-24 01:09:09 +02:00
|
|
|
*hdrsize = git_hdr_len;
|
2005-05-23 19:52:17 +02:00
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** --- followed by +++ ? */
|
|
|
|
if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We only accept unified patches, so we want it to
|
|
|
|
* at least have "@@ -a,b +c,d @@\n", which is 14 chars
|
|
|
|
* minimum
|
|
|
|
*/
|
|
|
|
nextlen = linelen(line + len, size - len);
|
|
|
|
if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Ok, we'll consider it a patch */
|
2005-05-26 19:23:51 +02:00
|
|
|
parse_traditional_patch(line, line+len, patch);
|
2005-05-23 19:52:17 +02:00
|
|
|
*hdrsize = len + nextlen;
|
2005-05-23 23:38:49 +02:00
|
|
|
linenr += 2;
|
2005-05-23 19:52:17 +02:00
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a unified diff. Note that this really needs
|
|
|
|
* to parse each fragment separately, since the only
|
|
|
|
* way to know the difference between a "---" that is
|
|
|
|
* part of a patch, and a "---" that starts the next
|
|
|
|
* patch is to look at the line counts..
|
|
|
|
*/
|
2005-05-26 19:23:51 +02:00
|
|
|
static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
|
2005-05-23 19:52:17 +02:00
|
|
|
{
|
|
|
|
int len = linelen(line, size), offset;
|
2005-05-23 23:38:49 +02:00
|
|
|
unsigned long pos[4], oldlines, newlines;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
offset = parse_fragment_header(line, len, fragment);
|
2005-05-23 19:52:17 +02:00
|
|
|
if (offset < 0)
|
|
|
|
return -1;
|
2005-05-26 19:23:51 +02:00
|
|
|
oldlines = fragment->oldlines;
|
|
|
|
newlines = fragment->newlines;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
if (patch->is_new < 0 && (pos[0] || oldlines))
|
|
|
|
patch->is_new = 0;
|
|
|
|
if (patch->is_delete < 0 && (pos[1] || newlines))
|
|
|
|
patch->is_delete = 0;
|
2005-05-24 01:09:09 +02:00
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
/* Parse the thing.. */
|
|
|
|
line += len;
|
|
|
|
size -= len;
|
2005-05-23 23:38:49 +02:00
|
|
|
linenr++;
|
|
|
|
for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
|
2005-05-23 19:52:17 +02:00
|
|
|
if (!oldlines && !newlines)
|
|
|
|
break;
|
|
|
|
len = linelen(line, size);
|
|
|
|
if (!len || line[len-1] != '\n')
|
|
|
|
return -1;
|
|
|
|
switch (*line) {
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
case ' ':
|
|
|
|
oldlines--;
|
|
|
|
newlines--;
|
|
|
|
break;
|
|
|
|
case '-':
|
|
|
|
oldlines--;
|
|
|
|
break;
|
|
|
|
case '+':
|
|
|
|
newlines--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
|
2005-05-23 19:52:17 +02:00
|
|
|
{
|
|
|
|
unsigned long offset = 0;
|
2005-05-26 19:23:51 +02:00
|
|
|
struct fragment **fragp = &patch->fragments;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
while (size > 4 && !memcmp(line, "@@ -", 4)) {
|
2005-05-26 19:23:51 +02:00
|
|
|
struct fragment *fragment;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
fragment = xmalloc(sizeof(*fragment));
|
|
|
|
memset(fragment, 0, sizeof(*fragment));
|
|
|
|
len = parse_fragment(line, size, patch, fragment);
|
2005-05-23 19:52:17 +02:00
|
|
|
if (len <= 0)
|
2005-05-23 23:38:49 +02:00
|
|
|
die("corrupt patch at line %d", linenr);
|
2005-05-23 19:52:17 +02:00
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
fragment->patch = line;
|
|
|
|
fragment->size = len;
|
|
|
|
|
|
|
|
*fragp = fragment;
|
|
|
|
fragp = &fragment->next;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
offset += len;
|
|
|
|
line += len;
|
|
|
|
size -= len;
|
|
|
|
}
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
|
2005-05-23 19:52:17 +02:00
|
|
|
{
|
|
|
|
int hdrsize, patchsize;
|
2005-05-26 19:23:51 +02:00
|
|
|
int offset = find_header(buffer, size, &hdrsize, patch);
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
if (offset < 0)
|
|
|
|
return offset;
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
return offset + hdrsize + patchsize;
|
|
|
|
}
|
|
|
|
|
2005-05-26 19:23:51 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
static int apply_patch(int fd)
|
|
|
|
{
|
|
|
|
unsigned long offset, size;
|
|
|
|
char *buffer = read_patch_file(fd, &size);
|
2005-05-26 19:23:51 +02:00
|
|
|
struct patch *list = NULL, **listp = &list;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
if (!buffer)
|
|
|
|
return -1;
|
|
|
|
offset = 0;
|
|
|
|
while (size > 0) {
|
2005-05-26 19:23:51 +02:00
|
|
|
struct patch *patch;
|
|
|
|
int nr;
|
|
|
|
|
|
|
|
patch = xmalloc(sizeof(*patch));
|
|
|
|
memset(patch, 0, sizeof(*patch));
|
|
|
|
nr = parse_chunk(buffer + offset, size, patch);
|
2005-05-23 19:52:17 +02:00
|
|
|
if (nr < 0)
|
|
|
|
break;
|
2005-05-26 19:23:51 +02:00
|
|
|
*listp = patch;
|
|
|
|
listp = &patch->next;
|
2005-05-23 19:52:17 +02:00
|
|
|
offset += nr;
|
|
|
|
size -= nr;
|
|
|
|
}
|
2005-05-26 19:23:51 +02:00
|
|
|
|
|
|
|
apply_patch_list(list);
|
|
|
|
|
2005-05-23 19:52:17 +02:00
|
|
|
free(buffer);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int i;
|
2005-05-24 01:42:21 +02:00
|
|
|
int read_stdin = 1;
|
2005-05-23 19:52:17 +02:00
|
|
|
|
|
|
|
if (read_cache() < 0)
|
|
|
|
die("unable to read index file");
|
|
|
|
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
if (!strcmp(arg, "-")) {
|
|
|
|
apply_patch(0);
|
2005-05-24 01:42:21 +02:00
|
|
|
read_stdin = 0;
|
2005-05-23 19:52:17 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(arg, "--no-merge")) {
|
|
|
|
merge_patch = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
fd = open(arg, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
usage(apply_usage);
|
2005-05-24 01:42:21 +02:00
|
|
|
read_stdin = 0;
|
2005-05-23 19:52:17 +02:00
|
|
|
apply_patch(fd);
|
|
|
|
close(fd);
|
|
|
|
}
|
2005-05-24 01:42:21 +02:00
|
|
|
if (read_stdin)
|
|
|
|
apply_patch(0);
|
2005-05-23 19:52:17 +02:00
|
|
|
return 0;
|
|
|
|
}
|