ident.c: add support for IPv6

diff --git a/usage.c b/usage.c
index 79856a2b9f5bc4603252cb10b471a0815416a617..82ff13163b542aab07e68bfa1056dc46316634a1 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -4,34 +4,52 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "git-compat-util.h"
+#include "cache.h"
 
-static void report(const char *prefix, const char *err, va_list params)
+static FILE *error_handle;
+static int tweaked_error_buffering;
+
+void vreportf(const char *prefix, const char *err, va_list params)
 {
-       char msg[4096];
-       vsnprintf(msg, sizeof(msg), err, params);
-       fprintf(stderr, "%s%s\n", prefix, msg);
+       FILE *fh = error_handle ? error_handle : stderr;
+
+       fflush(fh);
+       if (!tweaked_error_buffering) {
+               setvbuf(fh, NULL, _IOLBF, 0);
+               tweaked_error_buffering = 1;
+       }
+
+       fputs(prefix, fh);
+       vfprintf(fh, err, params);
+       fputc('\n', fh);
 }
 
 static NORETURN void usage_builtin(const char *err, va_list params)
 {
-       report("usage: ", err, params);
+       vreportf("usage: ", err, params);
        exit(129);
 }
 
 static NORETURN void die_builtin(const char *err, va_list params)
 {
-       report("fatal: ", err, params);
+       vreportf("fatal: ", err, params);
        exit(128);
 }
 
 static void error_builtin(const char *err, va_list params)
 {
-       report("error: ", err, params);
+       vreportf("error: ", err, params);
 }
 
 static void warn_builtin(const char *warn, va_list params)
 {
-       report("warning: ", warn, params);
+       vreportf("warning: ", warn, params);
+}
+
+static int die_is_recursing_builtin(void)
+{
+       static int dying;
+       return dying++;
 }
 
 /* If we are in a dlopen()ed .so write to a global variable would segfault
@@ -40,13 +58,30 @@ static NORETURN_PTR void (*usage_routine)(const char *err, va_list params) = usa
 static NORETURN_PTR void (*die_routine)(const char *err, va_list params) = die_builtin;
 static void (*error_routine)(const char *err, va_list params) = error_builtin;
 static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
+static int (*die_is_recursing)(void) = die_is_recursing_builtin;
 
 void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params))
 {
        die_routine = routine;
 }
 
-void usagef(const char *err, ...)
+void set_error_routine(void (*routine)(const char *err, va_list params))
+{
+       error_routine = routine;
+}
+
+void set_die_is_recursing_routine(int (*routine)(void))
+{
+       die_is_recursing = routine;
+}
+
+void set_error_handle(FILE *fh)
+{
+       error_handle = fh;
+       tweaked_error_buffering = 0;
+}
+
+void NORETURN usagef(const char *err, ...)
 {
        va_list params;
 
@@ -55,27 +90,38 @@ void usagef(const char *err, ...)
        va_end(params);
 }
 
-void usage(const char *err)
+void NORETURN usage(const char *err)
 {
        usagef("%s", err);
 }
 
-void die(const char *err, ...)
+void NORETURN die(const char *err, ...)
 {
        va_list params;
 
+       if (die_is_recursing()) {
+               fputs("fatal: recursion detected in die handler\n", stderr);
+               exit(128);
+       }
+
        va_start(params, err);
        die_routine(err, params);
        va_end(params);
 }
 
-void die_errno(const char *fmt, ...)
+void NORETURN die_errno(const char *fmt, ...)
 {
        va_list params;
        char fmt_with_err[1024];
        char str_error[256], *err;
        int i, j;
 
+       if (die_is_recursing()) {
+               fputs("fatal: recursion detected in die_errno handler\n",
+                       stderr);
+               exit(128);
+       }
+
        err = strerror(errno);
        for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) {
                if ((str_error[j++] = err[i++]) != '%')
@@ -97,6 +143,7 @@ void die_errno(const char *fmt, ...)
        va_end(params);
 }
 
+#undef error
 int error(const char *err, ...)
 {
        va_list params;