From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/6] quote_path: give flags parameter to quote_path()
Date: Thu, 10 Sep 2020 08:17:32 -0700 [thread overview]
Message-ID: <xmqq7dt1r78z.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqo8mdr7ve.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Thu, 10 Sep 2020 08:04:05 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Of course none of the above becomes unnecessary if we scan the whole
> string for SP before the main loop in quote-c-style-counted, but the
> function was written to process the input in a single pass and such
> a change defeats its design. If we need to do it in two passes, we
> can have the caller do so anyway, at least for now. That thinking
> lead to the final organization of the series, with two steps that
> used to be preparatory for passing the flag down thru to the bottom
> layer rebased out as a discardable appendix at the end.
Actually, this made me realize that another variant is possible.
It might be easier to read, or it might not. Since I cannot tell
without actually writing one, let's see ...
Instead of scanning the output from quote-c-style-counted for SP in
the caller, the caller can do something like this.
/* quote path as relative to the given prefix */
char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags)
{
struct strbuf sb = STRBUF_INIT;
const char *rel = relative_path(in, prefix, &sb);
int add_dq_ourselves = !!(flags & QUOTE_PATH_QUOTE_SP) && !!strchr(rel, ' ');
strbuf_reset(out);
if (add_dq_ourselves)
strbuf_addch(out, '"');
quote_c_style_counted(rel, strlen(rel), out, NULL,
add_dq_ourselves ? CQUOTE_NODQ : 0);
if (add_dq_ourselves)
strbuf_addch(out, '"');
strbuf_release(&sb);
return out->buf;
}
That is, we tell quote-c-style-counted not to put dq-pair around its
output whether it needs to do the backslash quoting, if we know we
want the result inside dq-pair anyway (iow, when the caller wants us
to treat SP specially and we do see SP in the input).
I don't know if this is easier to follow or not. I do think so
right now but that is only because it is still fresh in my brain.
next prev parent reply other threads:[~2020-09-10 19:42 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 [this message]
2020-09-10 20:26 ` Jeff King
2020-09-08 20:52 ` [PATCH 3/6] quote_path: optionally allow quoting a path with SP in it Junio C Hamano
2020-09-10 12:35 ` 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=xmqq7dt1r78z.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).