Merge branch 'jk/async-pkt-line'

diff --git a/usage.c b/usage.c
index 40b3de51c7dfa3fdaaeb44e1c64a2208560414c5..82ff13163b542aab07e68bfa1056dc46316634a1 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -6,25 +6,22 @@
 #include "git-compat-util.h"
 #include "cache.h"
 
-static int dying;
+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;
 
-void vwritef(int fd, const char *prefix, const char *err, va_list params)
-{
-       char msg[4096];
-       int len = vsnprintf(msg, sizeof(msg), err, params);
-       if (len > sizeof(msg))
-               len = sizeof(msg);
+       fflush(fh);
+       if (!tweaked_error_buffering) {
+               setvbuf(fh, NULL, _IOLBF, 0);
+               tweaked_error_buffering = 1;
+       }
 
-       write_in_full(fd, prefix, strlen(prefix));
-       write_in_full(fd, msg, len);
-       write_in_full(fd, "\n", 1);
+       fputs(prefix, fh);
+       vfprintf(fh, err, params);
+       fputc('\n', fh);
 }
 
 static NORETURN void usage_builtin(const char *err, va_list params)
@@ -49,12 +46,19 @@ static void warn_builtin(const char *warn, va_list 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
  * (ugh), so keep things static. */
 static NORETURN_PTR void (*usage_routine)(const char *err, va_list params) = usage_builtin;
 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))
 {
@@ -66,6 +70,17 @@ 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;
@@ -84,11 +99,10 @@ void NORETURN die(const char *err, ...)
 {
        va_list params;
 
-       if (dying) {
+       if (die_is_recursing()) {
                fputs("fatal: recursion detected in die handler\n", stderr);
                exit(128);
        }
-       dying = 1;
 
        va_start(params, err);
        die_routine(err, params);
@@ -102,12 +116,11 @@ void NORETURN die_errno(const char *fmt, ...)
        char str_error[256], *err;
        int i, j;
 
-       if (dying) {
+       if (die_is_recursing()) {
                fputs("fatal: recursion detected in die_errno handler\n",
                        stderr);
                exit(128);
        }
-       dying = 1;
 
        err = strerror(errno);
        for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) {