Re: va_copy is not available on all systems.
Johannes Sixt, Mon, Aug 20, 2007 15:16:56 +0200:
> 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
diff --git a/fast-import.c b/fast-import.c
index 2d5224c..04948e9 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");
@@ -396,9 +396,7 @@ static void write_crash_report(const char *err, va_list params)
fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
fputc('\n', rpt);
- fputs("fatal: ", rpt);
- vfprintf(rpt, err, params);
- fputc('\n', rpt);
+ fprintf(rpt, "fatal: %s\n", err);
fputc('\n', rpt);
fputs("Most Recent Commands Before Crash\n", rpt);
@@ -442,18 +440,15 @@ 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[BUFSIZ];
- va_copy(x_params, params);
- fputs("fatal: ", stderr);
- vfprintf(stderr, err, params);
- fputc('\n', stderr);
+ vsnprintf(message, sizeof(message), err, params);
+ fprintf(stderr, "fatal: %s\n", message);
if (!zombie) {
zombie = 1;
- write_crash_report(err, x_params);
+ write_crash_report(message);
}
- va_end(x_params);
exit(128);
}