Subject: [PATCH 1/8] strbuf.c: add strbuf_ensure_trailing_dr_sep()

From: Nguyễn Thái Ngọc Duy <[email-masked]>
Date: Wed, 28 Mar 2018 19:55:30 +0200

From: Duy Nguyen <[email-masked]>

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 <[email-masked]>
---
 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