From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>,
git@vger.kernel.org, Orgad and Raizel Shaneh <orgads@gmail.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 7/8] real_path(): properly handle nonexistent top-level paths
Date: Fri, 7 Sep 2012 00:41:03 +0200 [thread overview]
Message-ID: <1346971264-23744-8-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1346971264-23744-1-git-send-email-mhagger@alum.mit.edu>
The change has two points:
1. Do not strip off a leading slash, because that erroneously turns an
absolute path into a relative path.
2. Do not remove slashes from groups of multiple slashes; instead let
chdir() handle them. It could be, for example, that it wants to
leave leading double-slashes alone.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
abspath.c | 2 +-
t/t0060-path-utils.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abspath.c b/abspath.c
index 3e8325c..05f2d79 100644
--- a/abspath.c
+++ b/abspath.c
@@ -45,8 +45,8 @@ const char *real_path(const char *path)
if (!is_directory(buf)) {
char *last_slash = find_last_dir_sep(buf);
if (last_slash) {
- *last_slash = '\0';
last_elem = xstrdup(last_slash + 1);
+ last_slash[1] = '\0';
} else {
last_elem = xstrdup(buf);
*buf = '\0';
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 3121691..30361f9 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -148,7 +148,7 @@ test_expect_success 'real path rejects the empty string' '
test_must_fail test-path-utils real_path ""
'
-test_expect_failure POSIX 'real path works on absolute paths' '
+test_expect_success POSIX 'real path works on absolute paths' '
nopath="hopefully-absent-path" &&
test "/" = "$(test-path-utils real_path "/")" &&
test "/$nopath" = "$(test-path-utils real_path "/$nopath")" &&
--
1.7.11.3
next prev parent reply other threads:[~2012-09-06 22:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 22:40 [PATCH v2 0/8] Fix some bugs in abspath.c Michael Haggerty
2012-09-06 22:40 ` [PATCH v2 1/8] t0060: move tests of real_path() from t0000 to here Michael Haggerty
2012-09-06 22:40 ` [PATCH v2 2/8] t0060: verify that absolute_path() fails if passed the empty string Michael Haggerty
2012-09-06 22:40 ` [PATCH v2 3/8] absolute_path(): reject " Michael Haggerty
2012-09-06 23:09 ` Junio C Hamano
2012-09-09 4:48 ` Michael Haggerty
2012-09-09 4:59 ` Junio C Hamano
2012-09-06 22:41 ` [PATCH v2 4/8] t0060: verify that real_path() fails if passed " Michael Haggerty
2012-09-06 22:41 ` [PATCH v2 5/8] real_path(): reject " Michael Haggerty
2012-09-06 22:41 ` [PATCH v2 6/8] t0060: verify that real_path() works correctly with absolute paths Michael Haggerty
2012-09-06 22:41 ` Michael Haggerty [this message]
2012-09-06 22:41 ` [PATCH v2 8/8] t0060: verify that real_path() removes extra slashes Michael Haggerty
2012-09-09 15:42 ` [PATCH 9/8] t0060: split absolute path test in two to exercise some of it on Windows Johannes Sixt
2012-09-10 11:52 ` Michael Haggerty
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=1346971264-23744-8-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=orgads@gmail.com \
--cc=pclouds@gmail.com \
/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).