From: Johannes Sixt <j6t@kdbg.org>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/2] mingw: allow absolute paths without drive prefix
Date: Mon, 10 Dec 2018 22:58:28 +0100 [thread overview]
Message-ID: <11b17e5d-e843-463b-77da-263e8e3b7598@kdbg.org> (raw)
In-Reply-To: <50ac31ef7f4380f37a0e2d3b75e82b324afee9e3.1544467631.git.gitgitgadget@gmail.com>
Am 10.12.18 um 19:47 schrieb Johannes Schindelin via GitGitGadget:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> When specifying an absolute path without a drive prefix, we convert that
> path internally. Let's make sure that we handle that case properly, too
> ;-)
>
> This fixes the command
>
> git clone https://github.com/git-for-windows/git \G4W
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> compat/mingw.c | 10 +++++++++-
> t/t5580-clone-push-unc.sh | 2 +-
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/compat/mingw.c b/compat/mingw.c
> index 34b3880b29..4d009901d8 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -928,11 +928,19 @@ unsigned int sleep (unsigned int seconds)
> char *mingw_mktemp(char *template)
> {
> wchar_t wtemplate[MAX_PATH];
> + int offset = 0;
> +
> if (xutftowcs_path(wtemplate, template) < 0)
> return NULL;
> +
> + if (is_dir_sep(template[0]) && !is_dir_sep(template[1]) &&
> + iswalpha(wtemplate[0]) && wtemplate[1] == L':') {
> + /* We have an absolute path missing the drive prefix */
This comment is true for the source part, template, but I can't find
where the destination, wtemplate, suddenly gets the drive prefix. As far
as I can see, xutftowcs_path() just does a plain textual conversion
without any interpretation of the text as path. Can you explain it?
BTW, iswalpha() is not restricted to ASCII letters, I would rewrite it
as (wtemplate[0] <= 127 && isalpha(wtemplate[0]).
> + offset = 2;
> + }
> if (!_wmktemp(wtemplate))
> return NULL;
> - if (xwcstoutf(template, wtemplate, strlen(template) + 1) < 0)
> + if (xwcstoutf(template, wtemplate + offset, strlen(template) + 1) < 0)
> return NULL;
> return template;
> }
> diff --git a/t/t5580-clone-push-unc.sh b/t/t5580-clone-push-unc.sh
> index c2b0082296..17c38c33a5 100755
> --- a/t/t5580-clone-push-unc.sh
> +++ b/t/t5580-clone-push-unc.sh
> @@ -29,7 +29,7 @@ case "$UNCPATH" in
> ;;
> esac
>
> -test_expect_failure 'clone into absolute path lacking a drive prefix' '
> +test_expect_success 'clone into absolute path lacking a drive prefix' '
> USINGBACKSLASHES="$(echo "$WITHOUTDRIVE"/without-drive-prefix |
> tr / \\\\)" &&
> git clone . "$USINGBACKSLASHES" &&
>
-- Hannes
next prev parent reply other threads:[~2018-12-10 21:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 18:47 [PATCH 0/2] mingw: support absolute paths without a drive prefix Johannes Schindelin via GitGitGadget
2018-12-10 18:47 ` [PATCH 1/2] mingw: demonstrate a problem with certain absolute paths Johannes Schindelin via GitGitGadget
2018-12-10 18:47 ` [PATCH 2/2] mingw: allow absolute paths without drive prefix Johannes Schindelin via GitGitGadget
2018-12-10 21:58 ` Johannes Sixt [this message]
2018-12-11 11:25 ` Johannes Schindelin
2018-12-11 20:36 ` Johannes Sixt
2018-12-13 2:48 ` Junio C Hamano
2018-12-13 6:25 ` Johannes Sixt
2018-12-13 19:38 ` Johannes Sixt
2018-12-14 11:31 ` Johannes Schindelin
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=11b17e5d-e843-463b-77da-263e8e3b7598@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.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).