Re: [PATCH 3/3] verify_path: consider dos drive prefix
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 7, 2011, 19:22 UTC
- Message-ID
- <7vhb815tvm.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <BANLkTik3ywV91UtLSR_Dydjqg=pva+b0qg@mail.gmail.com>
Erik Faye-Lund <kusmabite@gmail.com> writes:
> I forgot to ask; do you want me to resend? I would imagine the commit > message should be updated to reflect this change as well...
Here is what I queued last night. If it looks Ok then I'll merge it down to 'next'.
-- >8 -- Subject: [PATCH] verify_path(): simplify check at the directory boundary
We simply want to say "At a directory boundary, be careful with a name that begins with a dot, forbid a name that ends with the boundary character or has duplicated bounadry characters".
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- read-cache.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 31cf0b5..3593291 100644 --- a/read-cache.c +++ b/read-cache.c @@ -784,16 +784,9 @@ int verify_path(const char *path) if (is_dir_sep(c)) { inside: c = *path++; - switch (c) { - default: - continue; - case '/': case '\0': - break; - case '.': - if (verify_dotfile(path)) - continue; - } - return 0; + if ((c == '.' && !verify_dotfile(path)) || + is_dir_sep(c) || c == '\0') + return 0; } c = *path++; }
-- 1.7.6.rc0.129.gbe6ef