quote_path: optionally allow quoting a path with SP in it
Some code in wt-status.c special case a path with SP in it, which usually does not have to be c-quoted, and ensure that such a path does get quoted. Move the logic to quote_path() and give it a bit in the flags word, QUOTE_PATH_QUOTE_SP. No behaviour change intended. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
15
wt-status.c
15
wt-status.c
@ -1877,21 +1877,12 @@ static void wt_shortstatus_status(struct string_list_item *it,
|
||||
const char *one;
|
||||
|
||||
if (d->rename_source) {
|
||||
one = quote_path(d->rename_source, s->prefix, &onebuf, 0);
|
||||
if (*one != '"' && strchr(one, ' ') != NULL) {
|
||||
putchar('"');
|
||||
strbuf_addch(&onebuf, '"');
|
||||
one = onebuf.buf;
|
||||
}
|
||||
one = quote_path(d->rename_source, s->prefix, &onebuf,
|
||||
QUOTE_PATH_QUOTE_SP);
|
||||
printf("%s -> ", one);
|
||||
strbuf_release(&onebuf);
|
||||
}
|
||||
one = quote_path(it->string, s->prefix, &onebuf, 0);
|
||||
if (*one != '"' && strchr(one, ' ') != NULL) {
|
||||
putchar('"');
|
||||
strbuf_addch(&onebuf, '"');
|
||||
one = onebuf.buf;
|
||||
}
|
||||
one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
|
||||
printf("%s\n", one);
|
||||
strbuf_release(&onebuf);
|
||||
}
|
||||
|
Reference in New Issue
Block a user