The is_empty_file() function can be generally useful, move it to dir.c and make it public. Signed-off-by: Antonio Ospite <ao2@xxxxxx> --- builtin/am.c | 15 --------------- dir.c | 16 ++++++++++++++++ dir.h | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 6273ea5195..0c04312a50 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -33,21 +33,6 @@ #include "string-list.h" #include "packfile.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. diff --git a/dir.c b/dir.c index 21e6f2520a..c1f7b90256 100644 --- a/dir.c +++ b/dir.c @@ -2412,6 +2412,22 @@ int is_empty_dir(const char *path) return ret; } +/** + * Returns 1 if the file is empty or does not exist, 0 otherwise. + */ +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; +} + static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) { DIR *dir; diff --git a/dir.h b/dir.h index f5fdedbab2..e45aa3f459 100644 --- a/dir.h +++ b/dir.h @@ -281,6 +281,7 @@ static inline int is_dot_or_dotdot(const char *name) } extern int is_empty_dir(const char *dir); +extern int is_empty_file(const char *filename); extern void setup_standard_excludes(struct dir_struct *dir); -- 2.18.0