[PATCH v6 22/44] builtin/apply: make create_file() return -1 on error

[Christian Couder]

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

To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", create_file() should just return what
add_conflicted_stages_file() and add_index_file() are returning
instead of calling exit().

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
 builtin/apply.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index 005ba78..76d473c 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4258,7 +4258,7 @@ static int add_conflicted_stages_file(struct apply_state 
*state,
        return 0;
 }
 
-static void create_file(struct apply_state *state, struct patch *patch)
+static int create_file(struct apply_state *state, struct patch *patch)
 {
        char *path = patch->new_name;
        unsigned mode = patch->new_mode;
@@ -4269,13 +4269,10 @@ static void create_file(struct apply_state *state, 
struct patch *patch)
                mode = S_IFREG | 0644;
        create_one_file(state, path, mode, buf, size);
 
-       if (patch->conflicted_threeway) {
-               if (add_conflicted_stages_file(state, patch))
-                       exit(1);
-       } else {
-               if (add_index_file(state, path, mode, buf, size))
-                       exit(1);
-       }
+       if (patch->conflicted_threeway)
+               return add_conflicted_stages_file(state, patch);
+       else
+               return add_index_file(state, path, mode, buf, size);
 }
 
 /* phase zero is to remove, phase one is to create */
@@ -4291,8 +4288,10 @@ static void write_out_one_result(struct apply_state 
*state,
                return;
        }
        if (patch->is_new > 0 || patch->is_copy) {
-               if (phase == 1)
-                       create_file(state, patch);
+               if (phase == 1) {
+                       if (create_file(state, patch))
+                               exit(1);
+               }
                return;
        }
        /*
@@ -4303,8 +4302,10 @@ static void write_out_one_result(struct apply_state 
*state,
                if (remove_file(state, patch, patch->is_rename))
                        exit(1);
        }
-       if (phase == 1)
-               create_file(state, patch);
+       if (phase == 1) {
+               if (create_file(state, patch))
+                       exit(1);
+       }
 }
 
 static int write_out_one_reject(struct apply_state *state, struct patch *patch)
-- 
2.9.0.rc2.362.g3cd93d0

--
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