From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
sbeller@google.com, peff@peff.net, jacob.keller@gmail.com,
gitster@pobox.com, ramsay@ramsayjones.plus.com, tboegi@web.de,
j6t@kdbg.org, pclouds@gmail.com, larsxschneider@gmail.com
Subject: [PATCH v5 2/5] real_path: convert real_path_internal to strbuf_realpath
Date: Wed, 4 Jan 2017 14:01:21 -0800 [thread overview]
Message-ID: <20170104220124.145808-3-bmwill@google.com> (raw)
In-Reply-To: <20170104220124.145808-1-bmwill@google.com>
Change the name of real_path_internal to strbuf_realpath. In addition
push the static strbuf up to its callers and instead take as a
parameter a pointer to a strbuf to use for the final result.
This change makes strbuf_realpath reentrant.
Signed-off-by: Brandon Williams <bmwill@google.com>
---
abspath.c | 53 +++++++++++++++++++++++++----------------------------
cache.h | 2 ++
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/abspath.c b/abspath.c
index 629201e48..a200d4220 100644
--- a/abspath.c
+++ b/abspath.c
@@ -57,21 +57,17 @@ static void get_next_component(struct strbuf *next, struct strbuf *remaining)
* Return the real path (i.e., absolute path, with symlinks resolved
* and extra slashes removed) equivalent to the specified path. (If
* you want an absolute path but don't mind links, use
- * absolute_path().) The return value is a pointer to a static
- * buffer.
+ * absolute_path().) Places the resolved realpath in the provided strbuf.
*
* The directory part of path (i.e., everything up to the last
* dir_sep) must denote a valid, existing directory, but the last
* component need not exist. If die_on_error is set, then die with an
* informative error message if there is a problem. Otherwise, return
* NULL on errors (without generating any output).
- *
- * If path is our buffer, then return path, as it's already what the
- * user wants.
*/
-static const char *real_path_internal(const char *path, int die_on_error)
+char *strbuf_realpath(struct strbuf *resolved, const char *path,
+ int die_on_error)
{
- static struct strbuf resolved = STRBUF_INIT;
struct strbuf remaining = STRBUF_INIT;
struct strbuf next = STRBUF_INIT;
struct strbuf symlink = STRBUF_INIT;
@@ -79,10 +75,6 @@ static const char *real_path_internal(const char *path, int die_on_error)
int num_symlinks = 0;
struct stat st;
- /* We've already done it */
- if (path == resolved.buf)
- return path;
-
if (!*path) {
if (die_on_error)
die("The empty string is not a valid path");
@@ -90,16 +82,16 @@ static const char *real_path_internal(const char *path, int die_on_error)
goto error_out;
}
- strbuf_reset(&resolved);
+ strbuf_reset(resolved);
if (is_absolute_path(path)) {
/* absolute path; start with only root as being resolved */
int offset = offset_1st_component(path);
- strbuf_add(&resolved, path, offset);
+ strbuf_add(resolved, path, offset);
strbuf_addstr(&remaining, path + offset);
} else {
/* relative path; can use CWD as the initial resolved path */
- if (strbuf_getcwd(&resolved)) {
+ if (strbuf_getcwd(resolved)) {
if (die_on_error)
die_errno("unable to get current working directory");
else
@@ -118,21 +110,21 @@ static const char *real_path_internal(const char *path, int die_on_error)
continue; /* '.' component */
} else if (next.len == 2 && !strcmp(next.buf, "..")) {
/* '..' component; strip the last path component */
- strip_last_component(&resolved);
+ strip_last_component(resolved);
continue;
}
/* append the next component and resolve resultant path */
- if (!is_dir_sep(resolved.buf[resolved.len - 1]))
- strbuf_addch(&resolved, '/');
- strbuf_addbuf(&resolved, &next);
+ if (!is_dir_sep(resolved->buf[resolved->len - 1]))
+ strbuf_addch(resolved, '/');
+ strbuf_addbuf(resolved, &next);
- if (lstat(resolved.buf, &st)) {
+ if (lstat(resolved->buf, &st)) {
/* error out unless this was the last component */
if (errno != ENOENT || remaining.len) {
if (die_on_error)
die_errno("Invalid path '%s'",
- resolved.buf);
+ resolved->buf);
else
goto error_out;
}
@@ -150,12 +142,12 @@ static const char *real_path_internal(const char *path, int die_on_error)
goto error_out;
}
- len = strbuf_readlink(&symlink, resolved.buf,
+ len = strbuf_readlink(&symlink, resolved->buf,
st.st_size);
if (len < 0) {
if (die_on_error)
die_errno("Invalid symlink '%s'",
- resolved.buf);
+ resolved->buf);
else
goto error_out;
}
@@ -163,8 +155,8 @@ static const char *real_path_internal(const char *path, int die_on_error)
if (is_absolute_path(symlink.buf)) {
/* absolute symlink; set resolved to root */
int offset = offset_1st_component(symlink.buf);
- strbuf_reset(&resolved);
- strbuf_add(&resolved, symlink.buf, offset);
+ strbuf_reset(resolved);
+ strbuf_add(resolved, symlink.buf, offset);
strbuf_remove(&symlink, 0, offset);
} else {
/*
@@ -172,7 +164,7 @@ static const char *real_path_internal(const char *path, int die_on_error)
* strip off the last component since it will
* be replaced with the contents of the symlink
*/
- strip_last_component(&resolved);
+ strip_last_component(resolved);
}
/*
@@ -192,24 +184,29 @@ static const char *real_path_internal(const char *path, int die_on_error)
}
}
- retval = resolved.buf;
+ retval = resolved->buf;
error_out:
strbuf_release(&remaining);
strbuf_release(&next);
strbuf_release(&symlink);
+ if (!retval)
+ strbuf_reset(resolved);
+
return retval;
}
const char *real_path(const char *path)
{
- return real_path_internal(path, 1);
+ static struct strbuf realpath = STRBUF_INIT;
+ return strbuf_realpath(&realpath, path, 1);
}
const char *real_path_if_valid(const char *path)
{
- return real_path_internal(path, 0);
+ static struct strbuf realpath = STRBUF_INIT;
+ return strbuf_realpath(&realpath, path, 0);
}
/*
diff --git a/cache.h b/cache.h
index a50a61a19..7a8129403 100644
--- a/cache.h
+++ b/cache.h
@@ -1064,6 +1064,8 @@ static inline int is_absolute_path(const char *path)
return is_dir_sep(path[0]) || has_dos_drive_prefix(path);
}
int is_directory(const char *);
+char *strbuf_realpath(struct strbuf *resolved, const char *path,
+ int die_on_error);
const char *real_path(const char *path);
const char *real_path_if_valid(const char *path);
const char *absolute_path(const char *path);
--
2.11.0.390.gc69c2f50cf-goog
next prev parent reply other threads:[~2017-01-04 22:01 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
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 ` Brandon Williams [this message]
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=20170104220124.145808-3-bmwill@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=larsxschneider@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).