trace: use strbuf for quote_crnl output

When we output GIT_TRACE_SETUP paths, we quote any
meta-characters. But our buffer to hold the result is only
PATH_MAX bytes, and we could double the size of the input
path (if every character needs quoting). We could use a
2*PATH_MAX buffer, if we assume the input will never be more
than PATH_MAX. But it's easier still to just switch to a
strbuf and not worry about whether the input can exceed
PATH_MAX or not.

The original copied the "p2" pointer to "p1", advancing
both. Since this gets rid of "p1", let's also drop "p2",
whose name is now confusing. We can just advance the
original "path" pointer.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-09-24 17:05:54 -04:00 коммит произвёл Junio C Hamano
Родитель 1d895f194f
Коммит 0bb443fdd2
1 изменённых файлов: 11 добавлений и 12 удалений

23
trace.c
Просмотреть файл

@ -277,25 +277,24 @@ void trace_performance_fl(const char *file, int line, uint64_t nanos,
static const char *quote_crnl(const char *path) static const char *quote_crnl(const char *path)
{ {
static char new_path[PATH_MAX]; static struct strbuf new_path = STRBUF_INIT;
const char *p2 = path;
char *p1 = new_path;
if (!path) if (!path)
return NULL; return NULL;
while (*p2) { strbuf_reset(&new_path);
switch (*p2) {
case '\\': *p1++ = '\\'; *p1++ = '\\'; break; while (*path) {
case '\n': *p1++ = '\\'; *p1++ = 'n'; break; switch (*path) {
case '\r': *p1++ = '\\'; *p1++ = 'r'; break; case '\\': strbuf_addstr(&new_path, "\\\\"); break;
case '\n': strbuf_addstr(&new_path, "\\n"); break;
case '\r': strbuf_addstr(&new_path, "\\r"); break;
default: default:
*p1++ = *p2; strbuf_addch(&new_path, *path);
} }
p2++; path++;
} }
*p1 = '\0'; return new_path.buf;
return new_path;
} }
/* FIXME: move prefix to startup_info struct and get rid of this arg */ /* FIXME: move prefix to startup_info struct and get rid of this arg */