[PATCH v2 24/94] builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
From: Christian Couder <hidden>
Date: 2016-06-16 02:19:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
To libify the apply functionality the 'unsafe_paths' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller <redacted> Signed-off-by: Christian Couder <redacted> --- builtin/apply.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index d699cd9..9209af4 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c@@ -54,6 +54,7 @@ struct apply_state { int unidiff_zero; int update_index; + int unsafe_paths; }; /*
@@ -64,7 +65,6 @@ static int newfd = -1; static int state_p_value = 1; static int p_value_known; static int apply = 1; -static int unsafe_paths; static const char *fake_ancestor; static int line_termination = '\n'; static unsigned int p_context = UINT_MAX;
@@ -3837,7 +3837,7 @@ static int check_patch(struct apply_state *state, struct patch *patch) } } - if (!unsafe_paths) + if (!state->unsafe_paths) die_on_unsafe_path(patch); /*
@@ -4621,7 +4621,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) N_("make sure the patch is applicable to the current index")), OPT_BOOL(0, "cached", &state.cached, N_("apply a patch without touching the working tree")), - OPT_BOOL(0, "unsafe-paths", &unsafe_paths, + OPT_BOOL(0, "unsafe-paths", &state.unsafe_paths, N_("accept a patch that touches outside the working area")), OPT_BOOL(0, "apply", &force_apply, N_("also apply the patch (use with --stat/--summary/--check)")),
@@ -4690,7 +4690,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) state.check_index = 1; } if (state.check_index) - unsafe_paths = 0; + state.unsafe_paths = 0; for (i = 0; i < argc; i++) { const char *arg = argv[i];
--
2.8.2.490.g3dabe57