From f3fc4a1b8680c114defd98ce6f2429f8946a5dc1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 Sep 2020 10:01:55 -0700 Subject: 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 --- quote.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'quote.c') diff --git a/quote.c b/quote.c index a86f9f22a2..aa9a37b1b1 100644 --- a/quote.c +++ b/quote.c @@ -360,6 +360,13 @@ char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigne quote_c_style_counted(rel, strlen(rel), out, NULL, 0); strbuf_release(&sb); + if ((flags & QUOTE_PATH_QUOTE_SP) && + (out->buf[0] != '"' && strchr(out->buf, ' '))) { + /* Ensure the whole thing is quoted if the path has SP in it */ + strbuf_insertstr(out, 0, "\""); + strbuf_addch(out, '"'); + } + return out->buf; } -- cgit v1.2.3