quote_path: fix collapsing of relative paths

diff --git a/usage.c b/usage.c
index 86211c9141b788f6dbdf7b192f0ac4f4e2527d64..a5fc4ec5fae66823266862fa0254474696c220e6 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -3,19 +3,68 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "git-compat-util.h"
 
 static void report(const char *prefix, const char *err, va_list params)
 {
-       fputs(prefix, stderr);
-       vfprintf(stderr, err, params);
-       fputs("\n", stderr);
+       char msg[256];
+       vsnprintf(msg, sizeof(msg), err, params);
+       fprintf(stderr, "%s%s\n", prefix, msg);
 }
 
-void usage(const char *err)
+static NORETURN void usage_builtin(const char *err)
 {
        fprintf(stderr, "usage: %s\n", err);
-       exit(1);
+       exit(129);
+}
+
+static NORETURN void die_builtin(const char *err, va_list params)
+{
+       report("fatal: ", err, params);
+       exit(128);
+}
+
+static void error_builtin(const char *err, va_list params)
+{
+       report("error: ", err, params);
+}
+
+static void warn_builtin(const char *warn, va_list params)
+{
+       report("warning: ", warn, params);
+}
+
+/* If we are in a dlopen()ed .so write to a global variable would segfault
+ * (ugh), so keep things static. */
+static void (*usage_routine)(const char *err) NORETURN = usage_builtin;
+static void (*die_routine)(const char *err, va_list params) NORETURN = 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;
+
+void set_usage_routine(void (*routine)(const char *err) NORETURN)
+{
+       usage_routine = routine;
+}
+
+void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN)
+{
+       die_routine = routine;
+}
+
+void set_error_routine(void (*routine)(const char *err, va_list params))
+{
+       error_routine = routine;
+}
+
+void set_warn_routine(void (*routine)(const char *warn, va_list params))
+{
+       warn_routine = routine;
+}
+
+
+void usage(const char *err)
+{
+       usage_routine(err);
 }
 
 void die(const char *err, ...)
@@ -23,9 +72,8 @@ void die(const char *err, ...)
        va_list params;
 
        va_start(params, err);
-       report("fatal: ", err, params);
+       die_routine(err, params);
        va_end(params);
-       exit(1);
 }
 
 int error(const char *err, ...)
@@ -33,7 +81,16 @@ int error(const char *err, ...)
        va_list params;
 
        va_start(params, err);
-       report("error: ", err, params);
+       error_routine(err, params);
        va_end(params);
        return -1;
 }
+
+void warning(const char *warn, ...)
+{
+       va_list params;
+
+       va_start(params, warn);
+       warn_routine(warn, params);
+       va_end(params);
+}