undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrapper.c: add a new function unlink_or_msg

Browse Source 
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>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ronnie Sahlberg 2014-07-16 11:20:36 -07:00 committed by Junio C Hamano
parent 3c93c847ca
commit 9ccc0c0896
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-compat-util.h
View File

@ -326,6 +326,8 @@ static inline char *git_find_last_dir_sep(const char *path)
#include "wildmatch.h" #include "wildmatch.h"
struct strbuf;
/* General helper functions */ /* General helper functions */
extern void vreportf(const char *prefix, const char *err, va_list params); 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); extern void vwritef(int fd, const char *prefix, const char *err, va_list params);
@ -781,6 +783,13 @@ void git_qsort(void *base, size_t nmemb, size_t size,
* not exist. * not exist.
*/ */
int unlink_or_warn(const char *path); 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. * Preserves errno, prints a message, but gives no warning for ENOENT.
* Returns 0 on success, which includes trying to remove a directory that does * Returns 0 on success, which includes trying to remove a directory that does

14
wrapper.c
View File

@ -475,6 +475,20 @@ static int warn_if_unremovable(const char *op, const char *file, int rc)
return 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) int unlink_or_warn(const char *file)
{ {
return warn_if_unremovable("unlink", file, unlink(file)); return warn_if_unremovable("unlink", file, unlink(file));