Re: va_copy is not available on all systems.
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:43:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
Alex Riesen [off-list ref] wrote:
Johannes Sixt, Mon, Aug 20, 2007 15:16:56 +0200:quoted
Since va_copy() must be provided by the compiler, we don't have a reasonable chance to provide a working definition in git_compat_util.h.Maybe we don't have to: Subject: [PATCH] Avoid using va_copy in fast-import: it seem to be unportable
Thanks Alex. This feels more like the right solution to the problem. I made a few minor edits, any comment? -->8-- From: Alex Riesen <redacted> Subject: [PATCH] Avoid using va_copy in fast-import: it seems to be unportable. [sp: minor change to use fputs, thus reducing the patch size] Signed-off-by: Alex Riesen <redacted> Signed-off-by: Shawn O. Pearce <redacted> --- fast-import.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 2d5224c..078079d 100644
--- a/fast-import.c
+++ b/fast-import.c@@ -375,7 +375,7 @@ static void write_branch_report(FILE *rpt, struct branch *b) fputc('\n', rpt); } -static void write_crash_report(const char *err, va_list params) +static void write_crash_report(const char *err) { char *loc = git_path("fast_import_crash_%d", getpid()); FILE *rpt = fopen(loc, "w");
@@ -397,7 +397,7 @@ static void write_crash_report(const char *err, va_list params) fputc('\n', rpt); fputs("fatal: ", rpt); - vfprintf(rpt, err, params); + fputs(err, rpt); fputc('\n', rpt); fputc('\n', rpt);
@@ -442,18 +442,17 @@ static void write_crash_report(const char *err, va_list params) static NORETURN void die_nicely(const char *err, va_list params) { static int zombie; - va_list x_params; + char message[2 * PATH_MAX]; - va_copy(x_params, params); + vsnprintf(message, sizeof(message), err, params); fputs("fatal: ", stderr); - vfprintf(stderr, err, params); + fputs(message, stderr); fputc('\n', stderr); if (!zombie) { zombie = 1; - write_crash_report(err, x_params); + write_crash_report(message); } - va_end(x_params); exit(128); }
--
1.5.3.rc5.40.g2f82
--
Shawn.