From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 3/6] quote_path: optionally allow quoting a path with SP in it
Date: Tue, 8 Sep 2020 13:52:21 -0700 [thread overview]
Message-ID: <20200908205224.4126551-4-gitster@pobox.com> (raw)
In-Reply-To: <20200908205224.4126551-1-gitster@pobox.com>
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>
---
quote.c | 9 ++++++++-
quote.h | 1 +
wt-status.c | 15 +++------------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/quote.c b/quote.c
index 03ca85afb0..aa9a37b1b1 100644
--- a/quote.c
+++ b/quote.c
@@ -357,9 +357,16 @@ char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigne
struct strbuf sb = STRBUF_INIT;
const char *rel = relative_path(in, prefix, &sb);
strbuf_reset(out);
- quote_c_style_counted(rel, strlen(rel), out, NULL, flags);
+ 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;
}
diff --git a/quote.h b/quote.h
index db7140b3c7..823f56cb94 100644
--- a/quote.h
+++ b/quote.h
@@ -73,6 +73,7 @@ void write_name_quoted_relative(const char *name, const char *prefix,
/* quote path as relative to the given prefix */
char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned);
+#define QUOTE_PATH_QUOTE_SP 01
/* quoting as a string literal for other languages */
void perl_quote_buf(struct strbuf *sb, const char *src);
diff --git a/wt-status.c b/wt-status.c
index d6ca7bd52c..adbf6958bd 100644
--- a/wt-status.c
+++ b/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);
}
--
2.28.0-539-g66371d8995
next prev parent reply other threads:[~2020-09-08 20:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 0:28 [Bug report] git status doesn't escape paths of untracked files Patrick Fong
2020-09-08 1:13 ` Junio C Hamano
2020-09-08 1:17 ` brian m. carlson
2020-09-08 1:30 ` Junio C Hamano
2020-09-08 4:41 ` Junio C Hamano
2020-09-08 17:39 ` Junio C Hamano
2020-09-08 19:01 ` Martin Ågren
2020-09-08 21:06 ` René Scharfe
2020-09-09 22:22 ` Junio C Hamano
2020-09-10 14:23 ` René Scharfe
2020-09-10 15:28 ` Junio C Hamano
2020-09-08 1:30 ` [PATCH] wt-status: quote paths identically whether tracked or untracked brian m. carlson
2020-09-08 20:52 ` [PATCH 0/6] quote_path() clean-ups Junio C Hamano
2020-09-08 20:52 ` [PATCH 1/6] quote_path: rename quote_path_relative() to quote_path() Junio C Hamano
2020-09-08 20:52 ` [PATCH 2/6] quote_path: give flags parameter " Junio C Hamano
2020-09-10 12:21 ` Jeff King
2020-09-10 15:04 ` Junio C Hamano
2020-09-10 15:17 ` Junio C Hamano
2020-09-10 20:26 ` Jeff King
2020-09-08 20:52 ` Junio C Hamano [this message]
2020-09-10 12:35 ` [PATCH 3/6] quote_path: optionally allow quoting a path with SP in it Jeff King
2020-09-08 20:52 ` [PATCH 4/6] wt-status: consistently quote paths in "status --short" output Junio C Hamano
2020-09-08 20:52 ` [PATCH 5/6] quote: rename misnamed sq_lookup[] to cq_lookup[] Junio C Hamano
2020-09-08 20:52 ` [PATCH 6/6] quote: turn 'nodq' parameter into a set of flags Junio C Hamano
2020-09-10 12:38 ` Jeff King
2020-09-08 22:56 ` [PATCH 0/6] quote_path() clean-ups Chris Torek
2020-09-10 12:39 ` Jeff King
2020-09-10 17:01 ` [PATCH v2 0/7] " Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 1/7] quote_path: rename quote_path_relative() to quote_path() Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 2/7] quote_path: give flags parameter " Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 3/7] quote_path: optionally allow quoting a path with SP in it Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 4/7] quote_path: code clarification Junio C Hamano
2020-09-10 18:08 ` Jeff King
2020-09-10 18:40 ` Junio C Hamano
2020-09-10 19:29 ` Jeff King
2020-09-10 17:01 ` [PATCH v2 5/7] wt-status: consistently quote paths in "status --short" output Junio C Hamano
2020-09-10 18:13 ` Jeff King
2020-09-10 18:38 ` Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 6/7] quote: rename misnamed sq_lookup[] to cq_lookup[] Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 7/7] quote: turn 'nodq' parameter into a set of flags Junio C Hamano
2020-09-10 23:03 ` [PATCH v2 0/7] quote_path() clean-ups brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200908205224.4126551-4-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).