git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v8 18/41] builtin/apply: change die_on_unsafe_path() to check_unsafe_path()

From
Christian Couder <christian.couder@gmail.com>
Date
Jun 27, 2016, 18:24 UTC
Message-ID
<20160627182429.31550-19-chriscool@tuxfamily.org>
In-Reply-To
<20160627182429.31550-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", die_on_unsafe_path() should return a negative integer instead of calling die(), so while doing that let's change its name to check_unsafe_path().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/apply.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index b48b526..d3a9da2 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3704,7 +3704,7 @@ static int path_is_beyond_symlink(struct apply_state *state, const char *name_)
 	return ret;
 }
 
-static void die_on_unsafe_path(struct patch *patch)
+static int check_unsafe_path(struct patch *patch)
 {
 	const char *old_name = NULL;
 	const char *new_name = NULL;
@@ -3716,9 +3716,10 @@ static void die_on_unsafe_path(struct patch *patch)
 		new_name = patch->new_name;
 
 	if (old_name && !verify_path(old_name))
-		die(_("invalid path '%s'"), old_name);
+		return error(_("invalid path '%s'"), old_name);
 	if (new_name && !verify_path(new_name))
-		die(_("invalid path '%s'"), new_name);
+		return error(_("invalid path '%s'"), new_name);
+	return 0;
 }
 
 /*
@@ -3808,8 +3809,8 @@ static int check_patch(struct apply_state *state, struct patch *patch)
 		}
 	}
 
-	if (!state->unsafe_paths)
-		die_on_unsafe_path(patch);
+	if (!state->unsafe_paths && check_unsafe_path(patch))
+		return -128;
 
 	/*
 	 * An attempt to read from or delete a path that is beyond a
@@ -3837,10 +3838,14 @@ static int check_patch_list(struct apply_state *state, struct patch *patch)
 	prepare_symlink_changes(state, patch);
 	prepare_fn_table(state, patch);
 	while (patch) {
+		int res;
 		if (state->apply_verbosely)
 			say_patch_name(stderr,
 				       _("Checking patch %s..."), patch);
-		err |= check_patch(state, patch);
+		res = check_patch(state, patch);
+		if (res == -128)
+			return -128;
+		err |= res;
 		patch = patch->next;
 	}
 	return err;
@@ -4472,11 +4477,16 @@ static int apply_patch(struct apply_state *state,
 		goto end;
 	}
 
-	if ((state->check || state->apply) &&
-	    check_patch_list(state, list) < 0 &&
-	    !state->apply_with_reject) {
-		res = -1;
-		goto end;
+	if (state->check || state->apply) {
+		int r = check_patch_list(state, list);
+		if (r == -128) {
+			res = -128;
+			goto end;
+		}
+		if (r < 0 && !state->apply_with_reject) {
+			res = -1;
+			goto end;
+		}
 	}
 
 	if (state->apply && write_out_results(state, list)) {

-- 
2.9.0.172.gfb57a78
Previous: Christian CouderNext: Christian Couder
Message 52 of 59 in “libify apply and use lib in am, part 2”
  1. 00/41 libify apply and use lib in am, part 2Christian Couder, Jun 27, 2016
  2. 03/41 builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder, Jun 27, 2016
  3. 06/41 builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder, Jun 27, 2016
  4. 07/41 builtin/apply: make parse_single_patch() return -1 on errorChristian Couder, Jun 27, 2016
  5. 01/41 apply: make some names more specificChristian Couder, Jun 27, 2016
  6. 12/41 builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder, Jun 27, 2016
  7. 19/41 builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder, Jun 27, 2016
  8. 14/41 builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder, Jun 27, 2016
  9. 16/41 builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder, Jun 27, 2016
  10. 28/41 builtin/apply: rename option parsing functionsChristian Couder, Jun 27, 2016
  11. 29/41 apply: rename and move opt constants to apply.hChristian Couder, Jun 27, 2016
  12. 23/41 builtin/apply: make create_file() return -1 on errorChristian Couder, Jun 27, 2016
  13. 24/41 builtin/apply: make write_out_one_result() return -1 on errorChristian Couder, Jun 27, 2016
  14. 21/41 builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder, Jun 27, 2016
  15. 20/41 builtin/apply: make remove_file() return -1 on errorChristian Couder, Jun 27, 2016
  16. 26/41 builtin/apply: make try_create_file() return -1 on errorChristian Couder, Jun 27, 2016
  17. 32/41 environment: add set_index_file()Christian Couder, Jun 27, 2016
  18. Junio C HamanoJul 26, 2016
  19. Duy NguyenJul 27, 2016
  20. Christian CouderJul 29, 2016
  21. Duy NguyenJul 29, 2016
  22. Christian CouderJul 29, 2016
  23. Duy NguyenJul 29, 2016
  24. Junio C HamanoJul 29, 2016
  25. 31/41 apply: make some parsing functions static againChristian Couder, Jun 27, 2016
  26. 38/41 usage: add get_error_routine() and get_warn_routine()Christian Couder, Jun 27, 2016
  27. 35/41 apply: make 'be_silent' incompatible with 'apply_verbosely'Christian Couder, Jun 27, 2016
  28. Junio C HamanoJul 26, 2016
  29. 39/41 apply: change error_routine when be_silent is setChristian Couder, Jun 27, 2016
  30. 33/41 write_or_die: use warning() instead of fprintf(stderr, ...)Christian Couder, Jun 27, 2016
  31. Junio C HamanoJun 28, 2016
  32. Christian CouderJun 30, 2016
  33. 40/41 builtin/am: use apply api in run_apply()Christian Couder, Jun 27, 2016
  34. Junio C HamanoJul 26, 2016
  35. 34/41 apply: add 'be_silent' variable to 'struct apply_state'Christian Couder, Jun 27, 2016
  36. Junio C HamanoJul 26, 2016
  37. 41/41 apply: use error_errno() where possibleChristian Couder, Jun 27, 2016
  38. 37/41 usage: add set_warn_routine()Christian Couder, Jun 27, 2016
  39. 36/41 apply: don't print on stdout when be_silent is setChristian Couder, Jun 27, 2016
  40. Junio C HamanoJul 26, 2016
  41. 22/41 builtin/apply: make add_index_file() return -1 on errorChristian Couder, Jun 27, 2016
  42. 13/41 builtin/apply: move check_apply_state() to apply.cChristian Couder, Jun 27, 2016
  43. 27/41 builtin/apply: make create_one_file() return -1 on errorChristian Couder, Jun 27, 2016
  44. 25/41 builtin/apply: make write_out_results() return -1 on errorChristian Couder, Jun 27, 2016
  45. 15/41 builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder, Jun 27, 2016
  46. 11/41 apply: make init_apply_state() return -1 instead of exit()ingChristian Couder, Jun 27, 2016
  47. 02/41 apply: move 'struct apply_state' to apply.hChristian Couder, Jun 27, 2016
  48. 04/41 builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder, Jun 27, 2016
  49. 08/41 builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder, Jun 27, 2016
  50. 09/41 builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ingChristian Couder, Jun 27, 2016
  51. 05/41 builtin/apply: make find_header() return -128 instead of die()ingChristian Couder, Jun 27, 2016
  52. 18/41 builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder, Jun 27, 2016
  53. 17/41 builtin/apply: make gitdiff_*() return -1 on errorChristian Couder, Jun 27, 2016
  54. 10/41 builtin/apply: move init_apply_state() to apply.cChristian Couder, Jun 27, 2016
  55. Christian CouderJun 27, 2016
  56. Junio C HamanoJul 26, 2016
  57. Christian CouderJul 27, 2016
  58. Junio C HamanoJul 27, 2016
  59. Christian CouderJul 30, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.