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

sq_quote_argv and add_to_string rework with strbuf's.

Browse Source 
* sq_quote_buf is made public, and works on a strbuf.
* sq_quote_argv also works on a strbuf.
* make sq_quote_argv take a "maxlen" argument to check the buffer won't grow
  too big.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pierre Habouzit
2007-09-20 00:42:13 +02:00
committed by Junio C Hamano
parent 663af3422a
commit 7a33bcbe80
6 changed files with 86 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
trace.c
View File

@ -64,7 +64,7 @@ static const char err_msg[] = "Could not trace into fd given by "
void trace_printf(const char *fmt, ...)
{
char buf[8192];
struct strbuf buf;
va_list ap;
int fd, len, need_close = 0;
@ -72,12 +72,22 @@ void trace_printf(const char *fmt, ...)
if (!fd)
return;
strbuf_init(&buf, 0);
va_start(ap, fmt);
len = vsnprintf(buf, sizeof(buf), fmt, ap);
len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
va_end(ap);
if (len >= sizeof(buf))
die("unreasonnable trace length");
write_or_whine_pipe(fd, buf, len, err_msg);
if (len >= strbuf_avail(&buf)) {
strbuf_grow(&buf, len - strbuf_avail(&buf) + 128);
va_start(ap, fmt);
len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
va_end(ap);
if (len >= strbuf_avail(&buf))
die("broken vsnprintf");
}
strbuf_setlen(&buf, len);
write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
strbuf_release(&buf);
if (need_close)
close(fd);
@ -85,31 +95,32 @@ void trace_printf(const char *fmt, ...)
void trace_argv_printf(const char **argv, int count, const char *fmt, ...)
{
char buf[8192];
struct strbuf buf;
va_list ap;
char *argv_str;
size_t argv_len;
int fd, len, need_close = 0;
fd = get_trace_fd(&need_close);
if (!fd)
return;
strbuf_init(&buf, 0);
va_start(ap, fmt);
len = vsnprintf(buf, sizeof(buf), fmt, ap);
len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
va_end(ap);
if (len >= sizeof(buf))
die("unreasonnable trace length");
if (len >= strbuf_avail(&buf)) {
strbuf_grow(&buf, len - strbuf_avail(&buf) + 128);
va_start(ap, fmt);
len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
va_end(ap);
if (len >= strbuf_avail(&buf))
die("broken vsnprintf");
}
strbuf_setlen(&buf, len);
/* Get the argv string. */
argv_str = sq_quote_argv(argv, count);
argv_len = strlen(argv_str);
write_or_whine_pipe(fd, buf, len, err_msg);
write_or_whine_pipe(fd, argv_str, argv_len, err_msg);
write_or_whine_pipe(fd, "\n", 1, err_msg);
free(argv_str);
sq_quote_argv(&buf, argv, count, 0);
strbuf_addch(&buf, '\n');
write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
strbuf_release(&buf);
if (need_close)
close(fd);