mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 02:14:03 +01:00
Code

builtin/apply: make parse_chunk() return a negative integer on error

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

To do that in a compatible manner with the rest of the error handling
in builtin/apply.c, parse_chunk() should return a negative integer
instead of calling die() or exit().

As parse_chunk() is called only by apply_patch() which already
returns either -1 or -128 when an error happened, let's make it also
return -1 or -128.

This makes it compatible with what find_header() and parse_binary()
already return.

Helped-by: Eric Sunshine <sunshine@sunshineco.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:03 +02:00 committed by Junio C Hamano
parent 5950851e44
commit b654b34c1c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/apply.c
View File

@ -1996,22 +1996,22 @@ static int use_patch(struct apply_state *state, struct patch *p)
return !state->has_include; return !state->has_include;
} }
/* /*
* Read the patch text in "buffer" that extends for "size" bytes; stop * Read the patch text in "buffer" that extends for "size" bytes; stop
* reading after seeing a single patch (i.e. changes to a single file). * reading after seeing a single patch (i.e. changes to a single file).
* Create fragments (i.e. patch hunks) and hang them to the given patch. * Create fragments (i.e. patch hunks) and hang them to the given patch.
* Return the number of bytes consumed, so that the caller can call us *
* again for the next patch. * Returns:
* -1 if no header was found or parse_binary() failed,
* -128 on another error,
* the number of bytes consumed otherwise,
* so that the caller can call us again for the next patch.
*/ */
static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch) static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)
{ {
int hdrsize, patchsize; int hdrsize, patchsize;
int offset = find_header(state, buffer, size, &hdrsize, patch); int offset = find_header(state, buffer, size, &hdrsize, patch);
if (offset == -128)
exit(128);
if (offset < 0) if (offset < 0)
return offset; return offset;
@ -2071,8 +2071,10 @@ static int parse_chunk(struct apply_state *state, char *buffer, unsigned long si
* empty to us here. * empty to us here.
*/ */
if ((state->apply || state->check) && if ((state->apply || state->check) &&
(!patch->is_binary && !metadata_changes(patch))) (!patch->is_binary && !metadata_changes(patch))) {
die(_("patch with only garbage at line %d"), state->linenr); error(_("patch with only garbage at line %d"), state->linenr);
return -128;
}
} }
return offset + hdrsize + patchsize; return offset + hdrsize + patchsize;
@ -4455,6 +4457,10 @@ static int apply_patch(struct apply_state *state,
nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch); nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
if (nr < 0) { if (nr < 0) {
free_patch(patch); free_patch(patch);
if (nr == -128) {
res = -128;
goto end;
}
break; break;
} }
if (state->apply_in_reverse) if (state->apply_in_reverse)