aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2009-06-27 17:58:44 +0200
committerJunio C Hamano <gitster@pobox.com>2009-06-27 11:14:53 -0700
commitb875036e5a2ab569a2123abe9ebfe25258227951 (patch)
treec11c59688995601576bc6726db42e7d41ac755d9
parent26c117d05d0714ab688ebcafc8eb68c769152bde (diff)
downloadgit-b875036e5a2ab569a2123abe9ebfe25258227951.tar.gz
git-b875036e5a2ab569a2123abe9ebfe25258227951.tar.xz
Introduce die_errno() that appends strerror(errno) to die()
There are many calls to die() that do, or should, report strerror(errno) to indicate how the syscall they guard failed. Introduce a small helper function for this case. Note: - POSIX says vsnprintf can modify errno in some unlikely cases, so we have to use errno early. - We take some care to pass the original format to die_routine(), in case someone wants to call die_errno() with custom format characters. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-compat-util.h1
-rw-r--r--usage.c12
2 files changed, 13 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index f25f7f1a9..0366cde05 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -162,6 +162,7 @@ extern char *gitbasename(char *);
/* General helper functions */
extern void usage(const char *err) NORETURN;
extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
+extern void die_errno(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
diff --git a/usage.c b/usage.c
index 820d09f92..fd936a1ae 100644
--- a/usage.c
+++ b/usage.c
@@ -60,6 +60,18 @@ void die(const char *err, ...)
va_end(params);
}
+void die_errno(const char *fmt, ...)
+{
+ va_list params;
+ char fmt_with_err[1024];
+
+ snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, strerror(errno));
+
+ va_start(params, fmt);
+ die_routine(fmt_with_err, params);
+ va_end(params);
+}
+
int error(const char *err, ...)
{
va_list params;