Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
builtin/apply.c | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 32c38f0..5bd5154 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4184,32 +4184,36 @@ static int try_create_file(const char *path, unsigned
int mode, const char *buf,
* We optimistically assume that the directories exist,
* which is true 99% of the time anyway. If they don't,
* we create them and try again.
+ *
+ * Returns:
+ * -1 on error
+ * 0 otherwise
*/
-static void create_one_file(struct apply_state *state,
- char *path,
- unsigned mode,
- const char *buf,
- unsigned long size)
+static int create_one_file(struct apply_state *state,
+ char *path,
+ unsigned mode,
+ const char *buf,
+ unsigned long size)
{
int res;
if (state->cached)
- return;
+ return 0;
res = try_create_file(path, mode, buf, size);
if (!res)
- return;
+ return 0;
if (res < 0)
- exit(1);
+ return -1;
if (errno == ENOENT) {
if (safe_create_leading_directories(path))
- return;
+ return 0;
res = try_create_file(path, mode, buf, size);
if (!res)
- return;
+ return 0;
if (res < 0)
- exit(1);
+ return -1;
}
if (errno == EEXIST || errno == EACCES) {
@@ -4230,18 +4234,19 @@ static void create_one_file(struct apply_state *state,
res = try_create_file(newpath, mode, buf, size);
if (!res) {
if (!rename(newpath, path))
- return;
+ return 0;
unlink_or_warn(newpath);
break;
}
if (res < 0)
- exit(1);
+ return -1;
if (errno != EEXIST)
break;
++nr;
}
}
- die_errno(_("unable to write file '%s' mode %o"), path, mode);
+ return error(_("unable to write file '%s' mode %o: %s"),
+ path, mode, strerror(errno));
}
static int add_conflicted_stages_file(struct apply_state *state,
@@ -4284,7 +4289,8 @@ static int create_file(struct apply_state *state, struct
patch *patch)
if (!mode)
mode = S_IFREG | 0644;
- create_one_file(state, path, mode, buf, size);
+ if (create_one_file(state, path, mode, buf, size))
+ return -1;
if (patch->conflicted_threeway)
return add_conflicted_stages_file(state, patch);
--
2.8.1.300.g5fed0c0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
