mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/apply: make gitdiff_*() return -1 on error

Browse Source 
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.

To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", gitdiff_*() functions should return -1 instead
of calling die().

A previous patch made it possible for gitdiff_*() functions to
return -1 in case of error. Let's take advantage of that to
make gitdiff_verify_name() return -1 on error, and to have
gitdiff_oldname() and gitdiff_newname() directly return
what gitdiff_verify_name() returns.

Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2016-08-08 23:03:14 +02:00
committed by Junio C Hamano
parent 70af7662d4
commit dbf1b5fb6a
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
builtin/apply.c
View File

@ -827,54 +827,56 @@ static int gitdiff_hdrend(struct apply_state *state,
#define DIFF_OLD_NAME 0 #define DIFF_OLD_NAME 0
#define DIFF_NEW_NAME 1 #define DIFF_NEW_NAME 1
static void gitdiff_verify_name(struct apply_state *state, static int gitdiff_verify_name(struct apply_state *state,
const char *line, const char *line,
int isnull, int isnull,
char **name, char **name,
int side) int side)
{ {
if (!*name && !isnull) { if (!*name && !isnull) {
*name = find_name(state, line, NULL, state->p_value, TERM_TAB); *name = find_name(state, line, NULL, state->p_value, TERM_TAB);
return; return 0;
} }
if (*name) { if (*name) {
int len = strlen(*name); int len = strlen(*name);
char *another; char *another;
if (isnull) if (isnull)
die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
*name, state->linenr); *name, state->linenr);
another = find_name(state, line, NULL, state->p_value, TERM_TAB); another = find_name(state, line, NULL, state->p_value, TERM_TAB);
if (!another || memcmp(another, *name, len + 1)) if (!another || memcmp(another, *name, len + 1)) {
die((side == DIFF_NEW_NAME) ? free(another);
return error((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename on line %d") : _("git apply: bad git-diff - inconsistent new filename on line %d") :
_("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr); _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
}
free(another); free(another);
} else { } else {
/* expect "/dev/null" */ /* expect "/dev/null" */
if (memcmp("/dev/null", line, 9) || line[9] != '\n') if (memcmp("/dev/null", line, 9) || line[9] != '\n')
die(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
} }
return 0;
} }
static int gitdiff_oldname(struct apply_state *state, static int gitdiff_oldname(struct apply_state *state,
const char *line, const char *line,
struct patch *patch) struct patch *patch)
{ {
gitdiff_verify_name(state, line, return gitdiff_verify_name(state, line,
patch->is_new, &patch->old_name, patch->is_new, &patch->old_name,
DIFF_OLD_NAME); DIFF_OLD_NAME);
return 0;
} }
static int gitdiff_newname(struct apply_state *state, static int gitdiff_newname(struct apply_state *state,
const char *line, const char *line,
struct patch *patch) struct patch *patch)
{ {
gitdiff_verify_name(state, line, return gitdiff_verify_name(state, line,
patch->is_delete, &patch->new_name, patch->is_delete, &patch->new_name,
DIFF_NEW_NAME); DIFF_NEW_NAME);
return 0;
} }
static int gitdiff_oldmode(struct apply_state *state, static int gitdiff_oldmode(struct apply_state *state,