Merge branch 'jk/url-insteadof-config'

diff --git a/usage.c b/usage.c
index 0efa3faf601231db35239161a1a7253b3975b3f8..2f87ca69a8299485ee013187f99ffbdb2618d7c8 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -6,22 +6,17 @@
 #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)
 {
-       FILE *fh = error_handle ? error_handle : stderr;
+       char msg[4096];
+       char *p;
 
-       fflush(fh);
-       if (!tweaked_error_buffering) {
-               setvbuf(fh, NULL, _IOLBF, 0);
-               tweaked_error_buffering = 1;
+       vsnprintf(msg, sizeof(msg), err, params);
+       for (p = msg; *p; p++) {
+               if (iscntrl(*p) && *p != '\t' && *p != '\n')
+                       *p = '?';
        }
-
-       fputs(prefix, fh);
-       vfprintf(fh, err, params);
-       fputc('\n', fh);
+       fprintf(stderr, "%s%s\n", prefix, msg);
 }
 
 static NORETURN void usage_builtin(const char *err, va_list params)
@@ -70,15 +65,24 @@ void set_error_routine(void (*routine)(const char *err, va_list params))
        error_routine = routine;
 }
 
-void set_die_is_recursing_routine(int (*routine)(void))
+void (*get_error_routine(void))(const char *err, va_list params)
 {
-       die_is_recursing = routine;
+       return error_routine;
 }
 
-void set_error_handle(FILE *fh)
+void set_warn_routine(void (*routine)(const char *warn, va_list params))
+{
+       warn_routine = routine;
+}
+
+void (*get_warn_routine(void))(const char *warn, va_list params)
+{
+       return warn_routine;
+}
+
+void set_die_is_recursing_routine(int (*routine)(void))
 {
-       error_handle = fh;
-       tweaked_error_buffering = 0;
+       die_is_recursing = routine;
 }
 
 void NORETURN usagef(const char *err, ...)
@@ -189,3 +193,35 @@ void warning(const char *warn, ...)
        warn_routine(warn, params);
        va_end(params);
 }
+
+static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_list params)
+{
+       char prefix[256];
+
+       /* truncation via snprintf is OK here */
+       if (file)
+               snprintf(prefix, sizeof(prefix), "BUG: %s:%d: ", file, line);
+       else
+               snprintf(prefix, sizeof(prefix), "BUG: ");
+
+       vreportf(prefix, fmt, params);
+       abort();
+}
+
+#ifdef HAVE_VARIADIC_MACROS
+NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       BUG_vfl(file, line, fmt, ap);
+       va_end(ap);
+}
+#else
+NORETURN void BUG(const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       BUG_vfl(NULL, 0, fmt, ap);
+       va_end(ap);
+}
+#endif