git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Karsten Blees" <karsten.blees@gmail.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Stefan Beller" <sbeller@google.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
	"Stefan Naewe" <stefan.naewe@atlas-elektronik.com>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v14 05/41] builtin/apply: make find_header() return -128 instead of die()ing
Date: Sun,  4 Sep 2016 22:17:57 +0200	[thread overview]
Message-ID: <20160904201833.21676-6-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160904201833.21676-1-chriscool@tuxfamily.org>

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, let's make find_header() return -128 instead of
calling die().

We could make it return -1, unfortunately find_header() already
returns -1 when no header is found.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/apply.c       | 40 ++++++++++++++++++++++++++++------------
 t/t4254-am-corrupt.sh |  2 +-
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index dd7afee..434ba0c 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1419,6 +1419,14 @@ static int parse_fragment_header(const char *line, int len, struct fragment *fra
 	return offset;
 }
 
+/*
+ * Find file diff header
+ *
+ * Returns:
+ *  -1 if no header was found
+ *  -128 in case of error
+ *   the size of the header in bytes (called "offset") otherwise
+ */
 static int find_header(struct apply_state *state,
 		       const char *line,
 		       unsigned long size,
@@ -1452,8 +1460,9 @@ static int find_header(struct apply_state *state,
 			struct fragment dummy;
 			if (parse_fragment_header(line, len, &dummy) < 0)
 				continue;
-			die(_("patch fragment without header at line %d: %.*s"),
-			    state->linenr, (int)len-1, line);
+			error(_("patch fragment without header at line %d: %.*s"),
+				     state->linenr, (int)len-1, line);
+			return -128;
 		}
 
 		if (size < len + 6)
@@ -1468,19 +1477,23 @@ static int find_header(struct apply_state *state,
 			if (git_hdr_len <= len)
 				continue;
 			if (!patch->old_name && !patch->new_name) {
-				if (!patch->def_name)
-					die(Q_("git diff header lacks filename information when removing "
-					       "%d leading pathname component (line %d)",
-					       "git diff header lacks filename information when removing "
-					       "%d leading pathname components (line %d)",
-					       state->p_value),
-					    state->p_value, state->linenr);
+				if (!patch->def_name) {
+					error(Q_("git diff header lacks filename information when removing "
+							"%d leading pathname component (line %d)",
+							"git diff header lacks filename information when removing "
+							"%d leading pathname components (line %d)",
+							state->p_value),
+						     state->p_value, state->linenr);
+					return -128;
+				}
 				patch->old_name = xstrdup(patch->def_name);
 				patch->new_name = xstrdup(patch->def_name);
 			}
-			if (!patch->is_delete && !patch->new_name)
-				die("git diff header lacks filename information "
-				    "(line %d)", state->linenr);
+			if (!patch->is_delete && !patch->new_name) {
+				error("git diff header lacks filename information "
+					     "(line %d)", state->linenr);
+				return -128;
+			}
 			patch->is_toplevel_relative = 1;
 			*hdrsize = git_hdr_len;
 			return offset;
@@ -1996,6 +2009,9 @@ static int parse_chunk(struct apply_state *state, char *buffer, unsigned long si
 	int hdrsize, patchsize;
 	int offset = find_header(state, buffer, size, &hdrsize, patch);
 
+	if (offset == -128)
+		exit(128);
+
 	if (offset < 0)
 		return offset;
 
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh
index 85716dd..9bd7dd2 100755
--- a/t/t4254-am-corrupt.sh
+++ b/t/t4254-am-corrupt.sh
@@ -29,7 +29,7 @@ test_expect_success 'try to apply corrupted patch' '
 '
 
 test_expect_success 'compare diagnostic; ensure file is still here' '
-	echo "fatal: git diff header lacks filename information (line 4)" >expected &&
+	echo "error: git diff header lacks filename information (line 4)" >expected &&
 	test_path_is_file f &&
 	test_cmp expected actual
 '
-- 
2.10.0.41.g9df52c3


  parent reply	other threads:[~2016-09-04 20:21 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-04 20:17 [PATCH v14 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-09-04 20:17 ` [PATCH v14 01/41] apply: make some names more specific Christian Couder
2016-09-04 20:17 ` [PATCH v14 02/41] apply: move 'struct apply_state' to apply.h Christian Couder
2016-09-04 20:17 ` [PATCH v14 03/41] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing Christian Couder
2016-09-04 20:17 ` [PATCH v14 04/41] builtin/apply: read_patch_file() return -1 " Christian Couder
2016-09-04 20:17 ` Christian Couder [this message]
2016-09-04 20:17 ` [PATCH v14 06/41] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-09-04 20:17 ` [PATCH v14 07/41] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-09-04 20:18 ` [PATCH v14 08/41] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-09-04 20:18 ` [PATCH v14 09/41] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 10/41] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-09-04 20:18 ` [PATCH v14 11/41] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-09-04 20:18 ` [PATCH v14 12/41] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-09-04 20:18 ` [PATCH v14 13/41] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-09-04 20:18 ` [PATCH v14 14/41] builtin/apply: make apply_all_patches() return 128 or 1 on error Christian Couder
2016-09-04 20:18 ` [PATCH v14 15/41] builtin/apply: make parse_traditional_patch() return -1 " Christian Couder
2016-09-04 20:18 ` [PATCH v14 16/41] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-09-04 20:18 ` [PATCH v14 17/41] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-09-04 20:18 ` [PATCH v14 18/41] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-09-04 20:18 ` [PATCH v14 19/41] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-09-04 20:18 ` [PATCH v14 20/41] builtin/apply: make remove_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 21/41] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 22/41] builtin/apply: make add_index_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 23/41] builtin/apply: make create_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 24/41] builtin/apply: make write_out_one_result() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 25/41] builtin/apply: make write_out_results() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 26/41] builtin/apply: make try_create_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 27/41] builtin/apply: make create_one_file() " Christian Couder
2016-09-04 20:18 ` [PATCH v14 28/41] builtin/apply: rename option parsing functions Christian Couder
2016-09-04 20:18 ` [PATCH v14 29/41] apply: rename and move opt constants to apply.h Christian Couder
2016-09-04 20:18 ` [PATCH v14 31/41] apply: make some parsing functions static again Christian Couder
2016-09-04 20:18 ` [PATCH v14 32/41] apply: use error_errno() where possible Christian Couder
2016-09-04 20:18 ` [PATCH v14 33/41] apply: make it possible to silently apply Christian Couder
2016-09-04 20:18 ` [PATCH v14 34/41] apply: don't print on stdout in verbosity_silent mode Christian Couder
2016-09-04 20:18 ` [PATCH v14 35/41] usage: add set_warn_routine() Christian Couder
2016-09-04 20:18 ` [PATCH v14 36/41] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-09-04 20:18 ` [PATCH v14 37/41] apply: change error_routine when silent Christian Couder
2016-09-04 20:18 ` [PATCH v14 38/41] apply: refactor `git apply` option parsing Christian Couder
2016-09-04 20:18 ` [PATCH v14 39/41] apply: pass apply state to build_fake_ancestor() Christian Couder
2016-09-04 20:18 ` [PATCH v14 40/41] apply: learn to use a different index file Christian Couder
2016-09-04 20:18 ` [PATCH v14 41/41] builtin/am: use apply API in run_apply() Christian Couder
     [not found] ` <20160904201833.21676-31-chriscool@tuxfamily.org>
2016-09-06 18:29   ` [PATCH v14 30/41] Move libified code from builtin/apply.c to apply.{c,h} Stefan Beller
2016-09-06 18:54 ` [PATCH v14 00/41] libify apply and use lib in am, part 2 Stefan Beller
2016-09-07 19:51 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160904201833.21676-6-chriscool@tuxfamily.org \
    --to=christian.couder@gmail.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=karsten.blees@gmail.com \
    --cc=l.s.r@web.de \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sbeller@google.com \
    --cc=stefan.naewe@atlas-elektronik.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).