[PATCH 1/3] quote: let caller reset buffer for quote_path_relative()
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:54:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/3] quote: let caller reset buffer for quote_path_relative() · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/3] quote: let caller reset buffer for quote_path_relative() · Nguyen Thai Ngoc Duy <hidden>
- 2016-06-15 · Re: [PATCH 1/3] quote: let caller reset buffer for quote_path_relative() · Junio C Hamano <hidden>
quote_path_relative() resetting output buffer is sometimes unnecessary as the buffer has never been used, and some other times makes it harder for the caller to use (see builtin/grep.c, the caller has to insert a string after quote_path_relative) Move the buffer reset back to call sites when necessary. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- The answer for Jeff's XXX in his patch, why strbuf_insert() instead of just adding in advance. builtin/clean.c | 2 ++ builtin/grep.c | 2 +- builtin/ls-files.c | 1 + quote.c | 1 - wt-status.c | 1 + 5 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 69c1cda..ff633cc 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c@@ -149,6 +149,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (S_ISDIR(st.st_mode)) { strbuf_addstr(&directory, ent->name); + strbuf_reset(&buf); qname = quote_path_relative(directory.buf, directory.len, &buf, prefix); if (show_only && (remove_directories || (matches == MATCHED_EXACTLY))) {
@@ -171,6 +172,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) } else { if (pathspec && !matches) continue; + strbuf_reset(&buf); qname = quote_path_relative(ent->name, -1, &buf, prefix); if (show_only) { printf(_("Would remove %s\n"), qname);
diff --git a/builtin/grep.c b/builtin/grep.c
index 82530a6..377c904 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c@@ -376,9 +376,9 @@ static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1, struct strbuf pathbuf = STRBUF_INIT; if (opt->relative && opt->prefix_length) { + strbuf_add(&pathbuf, filename, tree_name_len); quote_path_relative(filename + tree_name_len, -1, &pathbuf, opt->prefix); - strbuf_insert(&pathbuf, 0, filename, tree_name_len); } else { strbuf_addstr(&pathbuf, filename); }
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index b5434af..1e0cae9 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c@@ -395,6 +395,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, const char if (found_dup) continue; + strbuf_reset(&sb); name = quote_path_relative(pathspec[num], -1, &sb, prefix); error("pathspec '%s' did not match any file(s) known to git.", name);
diff --git a/quote.c b/quote.c
index 911229f..7e23ba9 100644
--- a/quote.c
+++ b/quote.c@@ -381,7 +381,6 @@ char *quote_path_relative(const char *in, int len, { struct strbuf sb = STRBUF_INIT; const char *rel = path_relative(in, len, &sb, prefix, -1); - strbuf_reset(out); quote_c_style_counted(rel, strlen(rel), out, NULL, 0); strbuf_release(&sb);
diff --git a/wt-status.c b/wt-status.c
index 2a9658b..be8b600 100644
--- a/wt-status.c
+++ b/wt-status.c@@ -690,6 +690,7 @@ static void wt_status_print_other(struct wt_status *s, struct string_list_item *it; const char *path; it = &(l->items[i]); + strbuf_reset(&buf); path = quote_path(it->string, strlen(it->string), &buf, s->prefix); if (column_active(s->colopts)) {
--
1.7.12.1.406.g6ab07c4