diff options
author | Ronnie Sahlberg <sahlberg@google.com> | 2014-07-16 11:20:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 14:40:23 -0700 |
commit | 8f348f3a3961c9b02055ddfd1149fbd605dee7f2 (patch) | |
tree | ee826b47cc74a1173ff9490156155b17ff1999e8 | |
parent | 15152588651cb0ef3a065755c06f3efa95925490 (diff) | |
download | git-8f348f3a3961c9b02055ddfd1149fbd605dee7f2.tar.gz |
wrapper.c: add a new function unlink_or_msg
This behaves like unlink_or_warn except that on failure it writes the message
to its 'err' argument, which the caller can display in an appropriate way or
ignore.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | git-compat-util.h | 9 | ||||
-rw-r--r-- | wrapper.c | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 611e77bd0e..5ee140c36e 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -307,6 +307,8 @@ extern char *gitbasename(char *); #include "wildmatch.h" +struct strbuf; + /* General helper functions */ extern void vreportf(const char *prefix, const char *err, va_list params); extern void vwritef(int fd, const char *prefix, const char *err, va_list params); @@ -710,6 +712,13 @@ void git_qsort(void *base, size_t nmemb, size_t size, * not exist. */ int unlink_or_warn(const char *path); + /* + * Tries to unlink file. Returns 0 if unlink succeeded + * or the file already didn't exist. Returns -1 and + * appends a message to err suitable for + * 'error("%s", err->buf)' on error. + */ +int unlink_or_msg(const char *file, struct strbuf *err); /* * Preserves errno, prints a message, but gives no warning for ENOENT. * Returns 0 on success which includes trying to remove a directory that does @@ -438,6 +438,20 @@ static int warn_if_unremovable(const char *op, const char *file, int rc) return rc; } +int unlink_or_msg(const char *file, struct strbuf *err) +{ + int rc = unlink(file); + + assert(err); + + if (!rc || errno == ENOENT) + return 0; + + strbuf_addf(err, "unable to unlink %s: %s", + file, strerror(errno)); + return -1; +} + int unlink_or_warn(const char *file) { return warn_if_unremovable("unlink", file, unlink(file)); |