error_routine: use parent's stderr if exec fails

The new process's error output may be redirected elsewhere, but if
the exec fails, output should still go to the parent's stderr. This
has already been done for the die_routine. Do the same for
error_routine.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-compat-util.h b/git-compat-util.h
index e0bb81ed8d0bd89f18b31b1c03d3e23744aea5a1..041cbdb93e637f94711155230ed8d08749d7523d 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -236,6 +236,7 @@ extern char *gitbasename(char *);
 
 /* General helper functions */
 extern void vreportf(const char *prefix, const char *err, va_list params);
 
 /* General helper functions */
 extern void vreportf(const char *prefix, const char *err, va_list params);

+extern void vwritef(int fd, const char *prefix, const char *err, va_list params);

 extern NORETURN void usage(const char *err);
 extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern NORETURN void usage(const char *err);
 extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));


@@ -244,6 +245,7 @@ extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
 
 extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
 extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
 
 extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));

+extern void set_error_routine(void (*routine)(const char *err, va_list params));

 
 extern int prefixcmp(const char *str, const char *prefix);
 extern int suffixcmp(const char *str, const char *suffix);
 
 extern int prefixcmp(const char *str, const char *prefix);
 extern int suffixcmp(const char *str, const char *suffix);

diff --git a/run-command.c b/run-command.c
index 70e8a249d0fe07b6a32b4da4ac8224d1c2f06b1b..5c91f37fb891c09bffa20343e037979ac340eaf1 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -77,16 +77,14 @@ static void notify_parent(void)
 
 static NORETURN void die_child(const char *err, va_list params)
 {
 
 static NORETURN void die_child(const char *err, va_list params)
 {

-       char msg[4096];
-       int len = vsnprintf(msg, sizeof(msg), err, params);
-       if (len > sizeof(msg))
-               len = sizeof(msg);
-
-       write_in_full(child_err, "fatal: ", 7);
-       write_in_full(child_err, msg, len);
-       write_in_full(child_err, "\n", 1);
+       vwritef(child_err, "fatal: ", err, params);

        exit(128);
 }
        exit(128);
 }

+
+static void error_child(const char *err, va_list params)
+{
+       vwritef(child_err, "error: ", err, params);
+}

 #endif
 
 static inline void set_cloexec(int fd)
 #endif
 
 static inline void set_cloexec(int fd)


@@ -217,6 +215,7 @@ int start_command(struct child_process *cmd)
                        set_cloexec(child_err);
                }
                set_die_routine(die_child);
                        set_cloexec(child_err);
                }
                set_die_routine(die_child);

+               set_error_routine(error_child);

 
                close(notify_pipe[0]);
                set_cloexec(notify_pipe[1]);
 
                close(notify_pipe[0]);
                set_cloexec(notify_pipe[1]);

diff --git a/usage.c b/usage.c
index b5e67e3d0d4a46a69d72371f4c6a0002e40a0bf1..a2a667800474e315a362e1d0623c17dafaad1022 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -4,6 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "git-compat-util.h"
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "git-compat-util.h"

+#include "cache.h"

 
 void vreportf(const char *prefix, const char *err, va_list params)
 {
 
 void vreportf(const char *prefix, const char *err, va_list params)
 {


@@ -12,6 +13,18 @@ void vreportf(const char *prefix, const char *err, va_list params)
        fprintf(stderr, "%s%s\n", prefix, msg);
 }
 
        fprintf(stderr, "%s%s\n", prefix, msg);
 }
 

+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);
+
+       write_in_full(fd, prefix, strlen(prefix));
+       write_in_full(fd, msg, len);
+       write_in_full(fd, "\n", 1);
+}
+

 static NORETURN void usage_builtin(const char *err, va_list params)
 {
        vreportf("usage: ", err, params);
 static NORETURN void usage_builtin(const char *err, va_list params)
 {
        vreportf("usage: ", err, params);


@@ -46,6 +59,11 @@ void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list param
        die_routine = routine;
 }
 
        die_routine = routine;
 }
 

+void set_error_routine(void (*routine)(const char *err, va_list params))
+{
+       error_routine = routine;
+}
+

 void NORETURN usagef(const char *err, ...)
 {
        va_list params;
 void NORETURN usagef(const char *err, ...)
 {
        va_list params;