From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] fix crash in path.c on Windows
Date: Thu, 05 Feb 2009 17:48:34 +0100 [thread overview]
Message-ID: <498B1862.5070703@lsrfire.ath.cx> (raw)
In-Reply-To: <498A9C01.6020602@viscovery.net>
Johannes Sixt schrieb:
> René Scharfe schrieb:
>> set a= getenv("a")
>> ======= ===========
>> c c
>> /c c:/
>> c/ c/
>> /c/ c:/
>> c:c c:c
>> /c:c c:c
>> c:/c c:/c
>> /c:/c c:/c
>> c/:/c c\;c:\
>> /c:c/ c:c/
>> /c/:c /c/:c
>> /c/:/c c:\;c:\
>> /c:/c/ c:/c/
>> /c/:/c/ c:\;c:\
>
> Bash translates leading single-letter path components to drive prefix
> notation if it invokes a non-MSYS program; and it also translates ':' to
> ';' if the value looks like a path list. Sometimes there is an ambiguity
> and bash guesses wrong.
Sure, but what rules or heuristics does it follow? Do we need to
post-process the results or can we simply change the test case in t1504?
>> @@ -387,7 +387,7 @@ int normalize_absolute_path(char *buf, const char *path)
>> assert(path);
>>
>> while (*comp_start) {
>> - assert(*comp_start == '/');
>> + assert(is_absolute_path(comp_start));
>> while (*++comp_end && *comp_end != '/')
>> ; /* nothing */
>> comp_len = comp_end - comp_start;
>
> Junio has pointed out your thinko here. Furthermore, *all* uses of '/' in
> this loop must be replaced by is_dir_sep().
It's not a thinko because I didn't think there. :) It's more a case of
mechanical refactoring resulting in confusing code. If we inline
is_absolute_path() manually there, we get the following:
assert(*comp_start == '/' || has_dos_drive_prefix(comp_start));
The loop works because DOS drive prefixes never contain slashes.
Is is_absolute_path() too forgiving on Windows, i.e. should it stop
classifying paths starting with a slash as absolute on that platform?
> But I would really appreciate if you could unify normalize_absolute_path()
> with setup.c's sanitary_path_copy() because they do almost the same thing
> (and the latter already works on Windows).
Good idea.
>> @@ -438,11 +438,20 @@ int longest_ancestor_length(const char *path, const char *prefix_list)
>> return -1;
>>
>> for (colon = ceil = prefix_list; *colon; ceil = colon+1) {
>> - for (colon = ceil; *colon && *colon != ':'; colon++);
>> + for (colon = ceil; *colon && *colon != PATH_SEP; colon++);
>> len = colon - ceil;
>> if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil))
>> continue;
>> strlcpy(buf, ceil, len+1);
>> +
>> + if (has_dos_drive_prefix(buf)) {
>> + char *p;
>> + for (p = buf; *p; p++) {
>> + if (*p == '\\')
>> + *p = '/';
>> + }
>
> IMNSHO this is a kind of normalization and, therefore, must be done by
> normalize_absolute_path() (sanitary_path_copy() already does this).
Makes sense.
René
next prev parent reply other threads:[~2009-02-05 16:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 23:00 [PATCH] fix crash in path.c on Windows René Scharfe
2009-02-04 23:51 ` Junio C Hamano
2009-02-05 7:57 ` Johannes Sixt
2009-02-05 16:48 ` René Scharfe [this message]
2009-02-05 17:13 ` Johannes Sixt
2009-02-05 20:41 ` Robin Rosenberg
2009-02-05 19:35 ` [PATCH] fix t1504 " René Scharfe
2009-02-06 12:55 ` Johannes Sixt
2009-02-06 13:11 ` Johannes Schindelin
2009-02-06 13:17 ` Johannes Sixt
2009-02-06 13:26 ` Johannes Schindelin
2009-02-06 13:36 ` Johannes Sixt
2009-02-06 17:18 ` René Scharfe
2009-02-06 19:23 ` Johannes Sixt
2009-02-06 21:45 ` René Scharfe
2009-02-07 15:08 ` [PATCH 0/5] Consolidate path normalization functions Johannes Sixt
2009-02-07 15:08 ` [PATCH 1/5] Make test-path-utils more robust against incorrect use Johannes Sixt
2009-02-07 15:08 ` [PATCH 2/5] Move sanitary_path_copy() to path.c and rename it to normalize_path_copy() Johannes Sixt
2009-02-07 15:08 ` [PATCH 3/5] Fix GIT_CEILING_DIRECTORIES on Windows Johannes Sixt
2009-02-07 15:08 ` [PATCH 4/5] Test and fix normalize_path_copy() Johannes Sixt
2009-02-07 15:08 ` [PATCH 5/5] Remove unused normalize_absolute_path() Johannes Sixt
2009-02-08 0:08 ` [PATCH 4/5] Test and fix normalize_path_copy() Robin Rosenberg
2009-02-08 8:52 ` Johannes Sixt
2009-02-08 14:46 ` René Scharfe
2009-02-08 15:50 ` Johannes Sixt
2009-02-07 0:25 ` [PATCH] fix t1504 on Windows René Scharfe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=498B1862.5070703@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.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.
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 NNTP newsgroup(s).