From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Rafael Ascensao <rafa.almas@gmail.com>,
Duy Nguyen <pclouds@gmail.com>
Subject: [PATCH 1/8] strbuf.c: add strbuf_ensure_trailing_dr_sep()
Date: Wed, 28 Mar 2018 19:55:30 +0200 [thread overview]
Message-ID: <20180328175537.17450-2-pclouds@gmail.com> (raw)
In-Reply-To: <20180328175537.17450-1-pclouds@gmail.com>
From: Duy Nguyen <pclouds@gmail.com>
This is just good cleanup and the logic will also be needed in new
patches.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
abspath.c | 4 +---
builtin/difftool.c | 6 ++----
dir-iterator.c | 3 +--
path.c | 9 +++------
strbuf.c | 6 ++++++
strbuf.h | 2 ++
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/abspath.c b/abspath.c
index 9857985329..994075b5c8 100644
--- a/abspath.c
+++ b/abspath.c
@@ -122,9 +122,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
continue;
}
- /* append the next component and resolve resultant path */
- if (!is_dir_sep(resolved->buf[resolved->len - 1]))
- strbuf_addch(resolved, '/');
+ strbuf_ensure_trailing_dir_sep(resolved);
strbuf_addbuf(resolved, &next);
if (lstat(resolved->buf, &st)) {
diff --git a/builtin/difftool.c b/builtin/difftool.c
index ee8dce019e..8d125c7968 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -88,8 +88,7 @@ static int parse_index_info(char *p, int *mode1, int *mode2,
static void add_path(struct strbuf *buf, size_t base_len, const char *path)
{
strbuf_setlen(buf, base_len);
- if (buf->len && buf->buf[buf->len - 1] != '/')
- strbuf_addch(buf, '/');
+ strbuf_ensure_trailing_dir_sep(buf);
strbuf_addstr(buf, path);
}
@@ -362,8 +361,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
strbuf_addf(&ldir, "%s/left/", tmpdir);
strbuf_addf(&rdir, "%s/right/", tmpdir);
strbuf_addstr(&wtdir, workdir);
- if (!wtdir.len || !is_dir_sep(wtdir.buf[wtdir.len - 1]))
- strbuf_addch(&wtdir, '/');
+ strbuf_ensure_trailing_dir_sep(&wtdir);
mkdir(ldir.buf, 0700);
mkdir(rdir.buf, 0700);
diff --git a/dir-iterator.c b/dir-iterator.c
index 34182a9a1c..249b5325cf 100644
--- a/dir-iterator.c
+++ b/dir-iterator.c
@@ -65,8 +65,7 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator)
* Note: dir_iterator_begin() ensures that
* path is not the empty string.
*/
- if (!is_dir_sep(iter->base.path.buf[iter->base.path.len - 1]))
- strbuf_addch(&iter->base.path, '/');
+ strbuf_ensure_trailing_dir_sep(&iter->base.path);
level->prefix_len = iter->base.path.len;
level->dir = opendir(iter->base.path.buf);
diff --git a/path.c b/path.c
index 3308b7b958..cd0ad89868 100644
--- a/path.c
+++ b/path.c
@@ -408,8 +408,7 @@ static void do_git_path(const struct repository *repo,
{
int gitdir_len;
strbuf_worktree_gitdir(buf, repo, wt);
- if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
- strbuf_addch(buf, '/');
+ strbuf_ensure_trailing_dir_sep(buf);
gitdir_len = buf->len;
strbuf_vaddf(buf, fmt, args);
if (!wt)
@@ -512,8 +511,7 @@ static void do_worktree_path(const struct repository *repo,
const char *fmt, va_list args)
{
strbuf_addstr(buf, repo->worktree);
- if(buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
- strbuf_addch(buf, '/');
+ strbuf_ensure_trailing_dir_sep(buf);
strbuf_vaddf(buf, fmt, args);
strbuf_cleanup_path(buf);
@@ -608,8 +606,7 @@ static void do_git_common_path(const struct repository *repo,
va_list args)
{
strbuf_addstr(buf, repo->commondir);
- if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
- strbuf_addch(buf, '/');
+ strbuf_ensure_trailing_dir_sep(buf);
strbuf_vaddf(buf, fmt, args);
strbuf_cleanup_path(buf);
}
diff --git a/strbuf.c b/strbuf.c
index 83d05024e6..d5b7cda61e 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -122,6 +122,12 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0';
}
+void strbuf_ensure_trailing_dir_sep(struct strbuf *sb)
+{
+ if (sb->len && !is_dir_sep(sb->buf[sb->len - 1]))
+ strbuf_addch(sb, '/');
+}
+
int strbuf_reencode(struct strbuf *sb, const char *from, const char *to)
{
char *out;
diff --git a/strbuf.h b/strbuf.h
index c4de5e4588..62dc7f16fa 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -189,6 +189,8 @@ extern void strbuf_ltrim(struct strbuf *);
/* Strip trailing directory separators */
extern void strbuf_trim_trailing_dir_sep(struct strbuf *);
+/* Append trailing directory separator if necessary */
+extern void strbuf_ensure_trailing_dir_sep(struct strbuf *sb);
/**
* Replace the contents of the strbuf with a reencoded form. Returns -1
--
2.17.0.rc1.439.gca064e2955
next prev parent reply other threads:[~2018-03-28 17:56 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 21:27 git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars Rafael Ascensao
2018-03-26 21:44 ` Ævar Arnfjörð Bjarmason
2018-03-27 6:31 ` Jeff King
2018-03-27 14:56 ` Duy Nguyen
2018-03-27 16:47 ` Jeff King
2018-03-27 17:09 ` Duy Nguyen
2018-03-27 17:30 ` Duy Nguyen
2018-03-28 9:52 ` Jeff King
2018-03-28 10:10 ` Duy Nguyen
2018-03-28 17:36 ` Jeff King
2018-03-28 17:38 ` [PATCH 1/4] set_git_dir: die when setenv() fails Jeff King
2018-03-28 17:40 ` [PATCH 2/4] add chdir-notify API Jeff King
2018-03-28 17:58 ` Eric Sunshine
2018-03-28 18:02 ` Jeff King
2018-03-29 14:53 ` Duy Nguyen
2018-03-29 17:48 ` Jeff King
2018-03-29 18:12 ` Duy Nguyen
2018-03-28 17:42 ` [PATCH 3/4] set_work_tree: use chdir_notify Jeff King
2018-03-29 17:02 ` Duy Nguyen
2018-03-29 17:23 ` Duy Nguyen
2018-03-29 17:50 ` Jeff King
2018-03-29 17:50 ` Jeff King
2018-03-29 18:01 ` Duy Nguyen
2018-03-30 17:23 ` Jeff King
2018-03-28 17:43 ` [PATCH 4/4] refs: use chdir_notify to update cached relative paths Jeff King
2018-03-30 18:34 ` [PATCH v2 0/5] re-parenting relative directories after chdir Jeff King
2018-03-30 18:34 ` [PATCH v2 1/5] set_git_dir: die when setenv() fails Jeff King
2018-03-30 18:34 ` [PATCH v2 2/5] trace.c: export trace_setup_key Jeff King
2018-03-30 19:46 ` Junio C Hamano
2018-03-30 19:47 ` Jeff King
2018-03-30 19:50 ` Junio C Hamano
2018-03-30 19:54 ` Jeff King
2018-03-30 18:35 ` [PATCH v2 3/5] add chdir-notify API Jeff King
2018-03-30 18:35 ` [PATCH v2 4/5] set_work_tree: use chdir_notify Jeff King
2018-03-30 18:35 ` [PATCH v2 5/5] refs: use chdir_notify to update cached relative paths Jeff King
2018-03-30 19:36 ` [PATCH v2 0/5] re-parenting relative directories after chdir Duy Nguyen
2018-03-28 9:47 ` git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars Jeff King
2018-03-28 17:55 ` [PATCH 0/8] " Nguyễn Thái Ngọc Duy
2018-03-28 17:55 ` Nguyễn Thái Ngọc Duy [this message]
2018-03-28 17:55 ` [PATCH 2/8] strbuf.c: reintroduce get_pwd_cwd() (with strbuf_ prefix) Nguyễn Thái Ngọc Duy
2018-03-28 18:02 ` Stefan Beller
2018-03-28 18:05 ` Duy Nguyen
2018-03-28 17:55 ` [PATCH 3/8] trace.c: export trace_setup_key Nguyễn Thái Ngọc Duy
2018-03-28 17:55 ` [PATCH 4/8] setup.c: introduce setup_adjust_path() Nguyễn Thái Ngọc Duy
2018-03-28 17:55 ` [PATCH 5/8] setup.c: allow other code to be notified when $CWD moves Nguyễn Thái Ngọc Duy
2018-03-28 17:55 ` [PATCH 6/8] environment.c: adjust env containing relpath when $CWD is moved Nguyễn Thái Ngọc Duy
2018-03-28 18:30 ` Jeff King
2018-03-28 18:45 ` Duy Nguyen
2018-03-28 17:55 ` [PATCH 7/8] repository: adjust repo paths when $CWD moves Nguyễn Thái Ngọc Duy
2018-03-28 17:55 ` [PATCH 8/8] refs: adjust main " Nguyễn Thái Ngọc Duy
2018-03-28 18:19 ` [PATCH 0/8] Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars Jeff King
2018-03-29 14:57 ` Duy Nguyen
2018-03-30 17:21 ` Jeff King
2018-03-28 22:24 ` Junio C Hamano
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=20180328175537.17450-2-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=rafa.almas@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.
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).