mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfv?asprintf are broken without va_copy, workaround them.

Browse Source 
* drop nfasprintf.
* move nfvasprintf into imap-send.c back, and let it work on a 8k buffer,
  and die() in case of overflow. It should be enough for imap commands, if
  someone cares about imap-send, he's welcomed to fix it properly.
* replace nfvasprintf use in merge-recursive with a copy of the strbuf_addf
  logic, it's one place, we'll live with it.
  To ease the change, output_buffer string list is replaced with a strbuf ;)
* rework trace.c to call vsnprintf itself.  It's used to format strerror()s
  and git command names, it should never be more than a few octets long, let
  it work on a 8k static buffer with vsnprintf or die loudly.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
This commit is contained in:
Pierre Habouzit
2007-09-20 10:43:11 +02:00
committed by Junio C Hamano
parent e03e05ff73
commit 19247e5510
4 changed files with 78 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
merge-recursive.c
View File

@ -85,63 +85,58 @@ struct stage_data
unsigned processed:1;
};
struct output_buffer
{
struct output_buffer *next;
char *str;
};
static struct path_list current_file_set = {NULL, 0, 0, 1};
static struct path_list current_directory_set = {NULL, 0, 0, 1};
static int call_depth = 0;
static int verbosity = 2;
static int buffer_output = 1;
static struct output_buffer *output_list, *output_end;
static struct strbuf obuf = STRBUF_INIT;
static int show (int v)
static int show(int v)
{
return (!call_depth && verbosity >= v) || verbosity >= 5;
}
static void output(int v, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
if (buffer_output && show(v)) {
struct output_buffer *b = xmalloc(sizeof(*b));
nfvasprintf(&b->str, fmt, args);
b->next = NULL;
if (output_end)
output_end->next = b;
else
output_list = b;
output_end = b;
} else if (show(v)) {
int i;
for (i = call_depth; i--;)
fputs(" ", stdout);
vfprintf(stdout, fmt, args);
fputc('\n', stdout);
}
va_end(args);
}
static void flush_output(void)
{
struct output_buffer *b, *n;
for (b = output_list; b; b = n) {
int i;
for (i = call_depth; i--;)
fputs(" ", stdout);
fputs(b->str, stdout);
fputc('\n', stdout);
n = b->next;
free(b->str);
free(b);
if (obuf.len) {
fputs(obuf.buf, stdout);
strbuf_reset(&obuf);
}
output_list = NULL;
output_end = NULL;
}
static void output(int v, const char *fmt, ...)
{
int len;
va_list ap;
if (!show(v))
return;
strbuf_grow(&obuf, call_depth * 2 + 2);
memset(obuf.buf + obuf.len, ' ', call_depth * 2);
strbuf_setlen(&obuf, obuf.len + call_depth * 2);
va_start(ap, fmt);
len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap);
va_end(ap);
if (len < 0)
len = 0;
if (len >= strbuf_avail(&obuf)) {
strbuf_grow(&obuf, len + 2);
va_start(ap, fmt);
len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap);
va_end(ap);
if (len >= strbuf_avail(&obuf)) {
die("this should not happen, your snprintf is broken");
}
}
strbuf_setlen(&obuf, obuf.len + len);
strbuf_add(&obuf, "\n", 1);
if (!buffer_output)
flush_output();
}
static void output_commit_title(struct commit *commit)