Merge branch 'po/po-readme'

diff --git a/usage.c b/usage.c
index ed146453cabeb9e82bef0c5610cda47d1b2a0b1c..82ff13163b542aab07e68bfa1056dc46316634a1 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -6,23 +6,22 @@
 #include "git-compat-util.h"
 #include "cache.h"
 
+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)
@@ -76,6 +75,12 @@ 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;