The fifth batch

[thirdparty/git.git] / tempfile.c

diff --git a/tempfile.c b/tempfile.c
index ecdebf1afb0d8465717c18409877fe310f980e46..ed88cf84314753443c8c42f0043320957d65d165 100644 (file)
--- a/tempfile.c
+++ b/tempfile.c
@@ -50,15 +50,17 @@
 
 static VOLATILE_LIST_HEAD(tempfile_list);
 
-static void remove_template_directory(struct tempfile *tempfile,
+static int remove_template_directory(struct tempfile *tempfile,
                                      int in_signal_handler)
 {
        if (tempfile->directory) {
                if (in_signal_handler)
-                       rmdir(tempfile->directory);
+                       return rmdir(tempfile->directory);
                else
-                       rmdir_or_warn(tempfile->directory);
+                       return rmdir_or_warn(tempfile->directory);
        }
+
+       return 0;
 }
 
 static void remove_tempfiles(int in_signal_handler)
@@ -353,16 +355,19 @@ int rename_tempfile(struct tempfile **tempfile_p, const char *path)
        return 0;
 }
 
-void delete_tempfile(struct tempfile **tempfile_p)
+int delete_tempfile(struct tempfile **tempfile_p)
 {
        struct tempfile *tempfile = *tempfile_p;
+       int err = 0;
 
        if (!is_tempfile_active(tempfile))
-               return;
+               return 0;
 
-       close_tempfile_gently(tempfile);
-       unlink_or_warn(tempfile->filename.buf);
-       remove_template_directory(tempfile, 0);
+       err |= close_tempfile_gently(tempfile);
+       err |= unlink_or_warn(tempfile->filename.buf);
+       err |= remove_template_directory(tempfile, 0);
        deactivate_tempfile(tempfile);
        *tempfile_p = NULL;
+
+       return err ? -1 : 0;
 }