From: Brandon Williams <bmwill@google.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: git@vger.kernel.org, sbeller@google.com, peff@peff.net,
jacob.keller@gmail.com, gitster@pobox.com,
ramsay@ramsayjones.plus.com, tboegi@web.de, pclouds@gmail.com
Subject: Re: [PATCH bw/realpath-wo-chdir] real_path: canonicalize directory separators in root parts
Date: Wed, 21 Dec 2016 14:33:04 -0800 [thread overview]
Message-ID: <20161221223304.GA119874@google.com> (raw)
In-Reply-To: <097e3e2e-f46d-b0aa-be9c-68c274c5e3dc@kdbg.org>
On 12/21, Johannes Sixt wrote:
> When an absolute path is resolved, resolution begins at the first path
> component after the root part. The root part is just copied verbatim,
> because it must not be inspected for symbolic links. For POSIX paths,
> this is just the initial slash, but on Windows, the root part has the
> forms c:\ or \\server\share. We do want to canonicalize the back-slashes
> in the root part because these parts are compared to the result of
> getcwd(), which does return a fully canonicalized path.
>
> Factor out a helper that splits off the root part, and have it
> canonicalize the copied part.
>
> This change was prompted because t1504-ceiling-dirs.sh caught a breakage
> in GIT_CEILING_DIRECTORIES handling on Windows.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> This introduces the second #ifdef GIT_WINDOWS_NATIVE in this file.
> It could be avoided if convert_slashes were defined as a do-nothing
> on POSIX, but that would not help the other occurrence. Therefore,
> I suggest to leave it at this.
>
> abspath.c | 29 +++++++++++++++++------------
> 1 file changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/abspath.c b/abspath.c
> index 79ee310867..1d56f5ed9f 100644
> --- a/abspath.c
> +++ b/abspath.c
> @@ -48,6 +48,19 @@ static void get_next_component(struct strbuf *next, struct strbuf *remaining)
> strbuf_remove(remaining, 0, end - remaining->buf);
> }
>
> +/* copies root part from remaining to resolved, canonicalizing it on the way */
> +static void get_root_part(struct strbuf *resolved, struct strbuf *remaining)
> +{
> + int offset = offset_1st_component(remaining->buf);
> +
> + strbuf_reset(resolved);
> + strbuf_add(resolved, remaining->buf, offset);
> +#ifdef GIT_WINDOWS_NATIVE
> + convert_slashes(resolved->buf);
> +#endif
So then the only extra cononicalization that is happening here is
converting '\\server\share' to '//server/share'? (or 'c:\' to 'c:/')
--
Brandon Williams
next prev parent reply other threads:[~2016-12-21 22:40 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 18:58 [PATCH] making real_path thread-safe Brandon Williams
2016-12-05 18:58 ` [PATCH] real_path: make " Brandon Williams
2016-12-05 19:57 ` Stefan Beller
2016-12-05 20:12 ` Brandon Williams
2016-12-05 20:38 ` Stefan Beller
2016-12-05 20:14 ` Stefan Beller
2016-12-05 20:16 ` Brandon Williams
2016-12-08 9:41 ` Duy Nguyen
2016-12-08 17:50 ` Brandon Williams
2016-12-06 23:44 ` Junio C Hamano
2016-12-07 0:10 ` Brandon Williams
2016-12-07 1:12 ` Ramsay Jones
2016-12-07 20:14 ` Torsten Bögershausen
2016-12-07 20:32 ` Junio C Hamano
2016-12-07 22:13 ` Brandon Williams
2016-12-08 7:55 ` Torsten Bögershausen
2016-12-08 18:41 ` Johannes Sixt
2016-12-08 19:02 ` Brandon Williams
2016-12-07 20:43 ` Johannes Sixt
2016-12-07 22:29 ` Brandon Williams
2016-12-08 11:32 ` Johannes Sixt
2016-12-08 16:54 ` Junio C Hamano
2016-12-08 23:58 ` [PATCH v2 0/4] road to reentrant real_path Brandon Williams
2016-12-08 23:58 ` [PATCH v2 1/4] real_path: resolve symlinks by hand Brandon Williams
2016-12-09 1:49 ` Jacob Keller
2016-12-09 14:33 ` Johannes Sixt
2016-12-09 20:04 ` Brandon Williams
2016-12-08 23:58 ` [PATCH v2 2/4] real_path: convert real_path_internal to strbuf_realpath Brandon Williams
2016-12-08 23:58 ` [PATCH v2 3/4] real_path: create real_pathdup Brandon Williams
2016-12-09 14:35 ` Johannes Sixt
2016-12-08 23:58 ` [PATCH v2 4/4] real_path: have callers use real_pathdup and strbuf_realpath Brandon Williams
2016-12-09 12:33 ` [PATCH v2 0/4] road to reentrant real_path Duy Nguyen
2016-12-09 19:42 ` Brandon Williams
2016-12-10 11:02 ` Duy Nguyen
2016-12-12 18:16 ` [PATCH v3 " Brandon Williams
2016-12-12 18:16 ` [PATCH v3 1/4] real_path: resolve symlinks by hand Brandon Williams
2016-12-12 22:19 ` Junio C Hamano
2016-12-12 22:50 ` Brandon Williams
2016-12-12 23:32 ` Junio C Hamano
2016-12-12 18:16 ` [PATCH v3 2/4] real_path: convert real_path_internal to strbuf_realpath Brandon Williams
2016-12-12 22:20 ` Junio C Hamano
2016-12-12 18:16 ` [PATCH v3 3/4] real_path: create real_pathdup Brandon Williams
2016-12-12 22:25 ` Junio C Hamano
2016-12-12 18:16 ` [PATCH v3 4/4] real_path: have callers use real_pathdup and strbuf_realpath Brandon Williams
2016-12-12 22:26 ` Junio C Hamano
2016-12-12 23:47 ` Junio C Hamano
2016-12-12 23:58 ` Stefan Beller
2016-12-13 1:15 ` Brandon Williams
2016-12-13 6:39 ` Junio C Hamano
2016-12-21 21:51 ` [PATCH bw/realpath-wo-chdir] real_path: canonicalize directory separators in root parts Johannes Sixt
2016-12-21 22:33 ` Brandon Williams [this message]
2016-12-22 6:07 ` Johannes Sixt
2016-12-22 17:33 ` Brandon Williams
2016-12-22 18:54 ` Johannes Sixt
2016-12-22 19:33 ` Junio C Hamano
2017-01-03 19:09 ` [PATCH v4 0/5] road to reentrant real_path Brandon Williams
2017-01-03 19:09 ` [PATCH v4 1/5] real_path: resolve symlinks by hand Brandon Williams
2017-01-03 19:09 ` [PATCH v4 2/5] real_path: convert real_path_internal to strbuf_realpath Brandon Williams
2017-01-03 19:09 ` [PATCH v4 3/5] real_path: create real_pathdup Brandon Williams
2017-01-03 19:09 ` [PATCH v4 4/5] real_path: have callers use real_pathdup and strbuf_realpath Brandon Williams
2017-01-04 1:07 ` Jacob Keller
2017-01-04 18:14 ` Brandon Williams
2017-01-03 19:09 ` [PATCH v4 5/5] real_path: canonicalize directory separators in root parts Brandon Williams
2017-01-04 0:48 ` [PATCH v4 0/5] road to reentrant real_path Jeff King
2017-01-04 6:56 ` Torsten Bögershausen
2017-01-04 7:01 ` Jeff King
2017-01-04 18:13 ` Brandon Williams
2017-01-04 18:22 ` Stefan Beller
2017-01-04 21:46 ` Jacob Keller
2017-01-04 21:55 ` Brandon Williams
2017-01-04 22:01 ` [PATCH v5 " Brandon Williams
2017-01-04 22:01 ` [PATCH v5 1/5] real_path: resolve symlinks by hand Brandon Williams
2017-01-04 22:01 ` [PATCH v5 2/5] real_path: convert real_path_internal to strbuf_realpath Brandon Williams
2017-01-04 22:01 ` [PATCH v5 3/5] real_path: create real_pathdup Brandon Williams
2017-01-04 22:01 ` [PATCH v5 4/5] real_path: have callers use real_pathdup and strbuf_realpath Brandon Williams
2017-01-04 22:01 ` [PATCH v5 5/5] real_path: canonicalize directory separators in root parts Brandon Williams
2017-01-08 3:09 ` [PATCH v5 0/5] road to reentrant real_path Junio C Hamano
2017-01-09 18:04 ` Brandon Williams
2017-01-09 18:18 ` Junio C Hamano
2017-01-09 18:24 ` Brandon Williams
2017-01-09 19:26 ` Junio C Hamano
2017-01-09 18:50 ` [PATCH 1/2] real_path: prevent redefinition of MAXSYMLINKS Brandon Williams
2017-01-09 18:50 ` [PATCH 2/2] real_path: set errno when max number of symlinks is exceeded Brandon Williams
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=20161221223304.GA119874@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jacob.keller@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sbeller@google.com \
--cc=tboegi@web.de \
/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).