wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

is_empty_file() can help to refactor a lot of code. This will be very
helpful in porting "git bisect" to C.

Suggested-by: Torsten Bögershausen <tboegi@web.de>
Mentored-by: Lars Schneider <larsxschneider@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/am.c b/builtin/am.c
index 8f27f3375b1e92f2ef026e0a1530ca8b6b3235bf..310eefe9e8e74a529e578d842b8d376a0afc0d8e 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -34,22 +34,6 @@
 #include "packfile.h"
 #include "repository.h"
 
 #include "packfile.h"
 #include "repository.h"
 

-/**
- * Returns 1 if the file is empty or does not exist, 0 otherwise.
- */
-static int is_empty_file(const char *filename)
-{
-       struct stat st;
-
-       if (stat(filename, &st) < 0) {
-               if (errno == ENOENT)
-                       return 1;
-               die_errno(_("could not stat %s"), filename);
-       }
-
-       return !st.st_size;
-}
-

 /**
  * Returns the length of the first line of msg.
  */
 /**
  * Returns the length of the first line of msg.
  */


@@ -1220,7 +1204,7 @@ static int parse_mail(struct am_state *state, const char *mail)
                goto finish;
        }
 
                goto finish;
        }
 

-       if (is_empty_file(am_path(state, "patch"))) {
+       if (is_empty_or_missing_file(am_path(state, "patch"))) {

                printf_ln(_("Patch is empty."));
                die_user_resolve(state);
        }
                printf_ln(_("Patch is empty."));
                die_user_resolve(state);
        }


@@ -1803,7 +1787,7 @@ static void am_run(struct am_state *state, int resume)
                resume = 0;
        }
 
                resume = 0;
        }
 

-       if (!is_empty_file(am_path(state, "rewritten"))) {
+       if (!is_empty_or_missing_file(am_path(state, "rewritten"))) {

                assert(state->rebasing);
                copy_notes_for_rebase(state);
                run_post_rewrite_hook(state);
                assert(state->rebasing);
                copy_notes_for_rebase(state);
                run_post_rewrite_hook(state);

diff --git a/cache.h b/cache.h
index ca36b44ee0b5851f837616c322a201ac420a90d2..9ff7e56b74d99b3c7dbd5f05b43be01af4543485 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1788,4 +1788,7 @@ void safe_create_dir(const char *dir, int share);
  */
 extern int print_sha1_ellipsis(void);
 
  */
 extern int print_sha1_ellipsis(void);
 

+/* Return 1 if the file is empty or does not exists, 0 otherwise. */
+extern int is_empty_or_missing_file(const char *filename);
+

 #endif /* CACHE_H */
 #endif /* CACHE_H */

diff --git a/wrapper.c b/wrapper.c
index e4fa9d84cd076770306114ff4f284155a5cdd2a1..ea3cf64d4c399ae84c156b850002459a8ffde72c 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -690,3 +690,16 @@ int xgethostname(char *buf, size_t len)
                buf[len - 1] = 0;
        return ret;
 }
                buf[len - 1] = 0;
        return ret;
 }

+
+int is_empty_or_missing_file(const char *filename)
+{
+       struct stat st;
+
+       if (stat(filename, &st) < 0) {
+               if (errno == ENOENT)
+                       return 1;
+               die_errno(_("could not stat %s"), filename);
+       }
+
+       return !st.st_size;
+}