X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=usage.c;h=b6aea45280bf2aa4c06a0130f912a61377165016;hb=39c448c19de7269e6130b6e183645c5b9afe0579;hp=820d09f92b03b6cc96fbe9a954c37fd2d5e5a417;hpb=1966af81760aea2966f8f218d442aed5f296b992;p=git.git

diff --git a/usage.c b/usage.c
index 820d09f92..b6aea4528 100644
--- a/usage.c
+++ b/usage.c
@@ -60,6 +60,34 @@ void die(const char *err, ...)
 	va_end(params);
 }
 
+void die_errno(const char *fmt, ...)
+{
+	va_list params;
+	char fmt_with_err[1024];
+	char str_error[256], *err;
+	int i, j;
+
+	err = strerror(errno);
+	for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) {
+		if ((str_error[j++] = err[i++]) != '%')
+			continue;
+		if (j < sizeof(str_error) - 1) {
+			str_error[j++] = '%';
+		} else {
+			/* No room to double the '%', so we overwrite it with
+			 * '\0' below */
+			j--;
+			break;
+		}
+	}
+	str_error[j] = 0;
+	snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error);
+
+	va_start(params, fmt);
+	die_routine(fmt_with_err, params);
+	va_end(params);
+}
+
 int error(const char *err, ...)
 {
 	va_list params;