mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 20:06:10 +02:00
Code

quote_path: give flags parameter to quote_path() 

The quote_path() function computes a path (relative to its base
directory) and c-quotes the result if necessary.  Teach it to take a
flags parameter to allow its behaviour to be enriched later.

No behaviour change intended.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2020-09-10 10:01:54 -07:00
parent c34d24b8a4
commit 88910c9939
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/clean.c
View File

@ -162,7 +162,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
is_nonbare_repository_dir(path)) { is_nonbare_repository_dir(path)) {
if (!quiet) { if (!quiet) {
quote_path(path->buf, prefix, &quoted); quote_path(path->buf, prefix, &quoted, 0);
printf(dry_run ? _(msg_would_skip_git_dir) : _(msg_skip_git_dir), printf(dry_run ? _(msg_would_skip_git_dir) : _(msg_skip_git_dir),
quoted.buf); quoted.buf);
} }
@ -177,7 +177,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
res = dry_run ? 0 : rmdir(path->buf); res = dry_run ? 0 : rmdir(path->buf);
if (res) { if (res) {
int saved_errno = errno; int saved_errno = errno;
quote_path(path->buf, prefix, &quoted); quote_path(path->buf, prefix, &quoted, 0);
errno = saved_errno; errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), quoted.buf); warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0; *dir_gone = 0;
@ -202,7 +202,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone)) if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone))
ret = 1; ret = 1;
if (gone) { if (gone) {
quote_path(path->buf, prefix, &quoted); quote_path(path->buf, prefix, &quoted, 0);
string_list_append(&dels, quoted.buf); string_list_append(&dels, quoted.buf);
} else } else
*dir_gone = 0; *dir_gone = 0;
@ -210,11 +210,11 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
} else { } else {
res = dry_run ? 0 : unlink(path->buf); res = dry_run ? 0 : unlink(path->buf);
if (!res) { if (!res) {
quote_path(path->buf, prefix, &quoted); quote_path(path->buf, prefix, &quoted, 0);
string_list_append(&dels, quoted.buf); string_list_append(&dels, quoted.buf);
} else { } else {
int saved_errno = errno; int saved_errno = errno;
quote_path(path->buf, prefix, &quoted); quote_path(path->buf, prefix, &quoted, 0);
errno = saved_errno; errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), quoted.buf); warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0; *dir_gone = 0;
@ -238,7 +238,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
*dir_gone = 1; *dir_gone = 1;
else { else {
int saved_errno = errno; int saved_errno = errno;
quote_path(path->buf, prefix, &quoted); quote_path(path->buf, prefix, &quoted, 0);
errno = saved_errno; errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), quoted.buf); warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0; *dir_gone = 0;
@ -266,7 +266,7 @@ static void pretty_print_dels(void)
struct column_options copts; struct column_options copts;
for_each_string_list_item(item, &del_list) { for_each_string_list_item(item, &del_list) {
qname = quote_path(item->string, NULL, &buf); qname = quote_path(item->string, NULL, &buf, 0);
string_list_append(&list, qname); string_list_append(&list, qname);
} }
@ -753,7 +753,7 @@ static int ask_each_cmd(void)
for_each_string_list_item(item, &del_list) { for_each_string_list_item(item, &del_list) {
/* Ctrl-D should stop removing files */ /* Ctrl-D should stop removing files */
if (!eof) { if (!eof) {
qname = quote_path(item->string, NULL, &buf); qname = quote_path(item->string, NULL, &buf, 0);
/* TRANSLATORS: Make sure to keep [y/N] as is */ /* TRANSLATORS: Make sure to keep [y/N] as is */
printf(_("Remove %s [y/N]? "), qname); printf(_("Remove %s [y/N]? "), qname);
if (git_read_line_interactively(&confirm) == EOF) { if (git_read_line_interactively(&confirm) == EOF) {
@ -1047,19 +1047,19 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (remove_dirs(&abs_path, prefix, rm_flags, dry_run, quiet, &gone)) if (remove_dirs(&abs_path, prefix, rm_flags, dry_run, quiet, &gone))
errors++; errors++;
if (gone && !quiet) { if (gone && !quiet) {
qname = quote_path(item->string, NULL, &buf); qname = quote_path(item->string, NULL, &buf, 0);
printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname); printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
} }
} else { } else {
res = dry_run ? 0 : unlink(abs_path.buf); res = dry_run ? 0 : unlink(abs_path.buf);
if (res) { if (res) {
int saved_errno = errno; int saved_errno = errno;
qname = quote_path(item->string, NULL, &buf); qname = quote_path(item->string, NULL, &buf, 0);
errno = saved_errno; errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), qname); warning_errno(_(msg_warn_remove_failed), qname);
errors++; errors++;
} else if (!quiet) { } else if (!quiet) {
qname = quote_path(item->string, NULL, &buf); qname = quote_path(item->string, NULL, &buf, 0);
printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname); printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
} }
} }

2
builtin/grep.c
View File

@ -319,7 +319,7 @@ static void grep_source_name(struct grep_opt *opt, const char *filename,
} }
if (opt->relative && opt->prefix_length) if (opt->relative && opt->prefix_length)
quote_path(filename + tree_name_len, opt->prefix, out); quote_path(filename + tree_name_len, opt->prefix, out, 0);
else else
quote_c_style(filename + tree_name_len, out, NULL, 0); quote_c_style(filename + tree_name_len, out, NULL, 0);

2
quote.c
View File

@ -352,7 +352,7 @@ void write_name_quoted_relative(const char *name, const char *prefix,
} }
/* quote path as relative to the given prefix */ /* quote path as relative to the given prefix */
char *quote_path(const char *in, const char *prefix, struct strbuf *out) char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags)
{ {
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
const char *rel = relative_path(in, prefix, &sb); const char *rel = relative_path(in, prefix, &sb);

2
quote.h
View File

@ -72,7 +72,7 @@ void write_name_quoted_relative(const char *name, const char *prefix,
FILE *fp, int terminator); FILE *fp, int terminator);
/* quote path as relative to the given prefix */ /* quote path as relative to the given prefix */
char *quote_path(const char *in, const char *prefix, struct strbuf *out); char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags);
/* quoting as a string literal for other languages */ /* quoting as a string literal for other languages */
void perl_quote_buf(struct strbuf *sb, const char *src); void perl_quote_buf(struct strbuf *sb, const char *src);

24
wt-status.c
View File

@ -336,7 +336,7 @@ static void wt_longstatus_print_unmerged_data(struct wt_status *s,
memset(padding, ' ', label_width); memset(padding, ' ', label_width);
} }
one = quote_path(it->string, s->prefix, &onebuf); one = quote_path(it->string, s->prefix, &onebuf, 0);
status_printf(s, color(WT_STATUS_HEADER, s), "\t"); status_printf(s, color(WT_STATUS_HEADER, s), "\t");
how = wt_status_unmerged_status_string(d->stagemask); how = wt_status_unmerged_status_string(d->stagemask);
@ -402,8 +402,8 @@ static void wt_longstatus_print_change_data(struct wt_status *s,
if (d->rename_status == status) if (d->rename_status == status)
one_name = d->rename_source; one_name = d->rename_source;
one = quote_path(one_name, s->prefix, &onebuf); one = quote_path(one_name, s->prefix, &onebuf, 0);
two = quote_path(two_name, s->prefix, &twobuf); two = quote_path(two_name, s->prefix, &twobuf, 0);
status_printf(s, color(WT_STATUS_HEADER, s), "\t"); status_printf(s, color(WT_STATUS_HEADER, s), "\t");
what = wt_status_diff_status_string(status); what = wt_status_diff_status_string(status);
@ -964,7 +964,7 @@ static void wt_longstatus_print_other(struct wt_status *s,
struct string_list_item *it; struct string_list_item *it;
const char *path; const char *path;
it = &(l->items[i]); it = &(l->items[i]);
path = quote_path(it->string, s->prefix, &buf); path = quote_path(it->string, s->prefix, &buf, 0);
if (column_active(s->colopts)) { if (column_active(s->colopts)) {
string_list_append(&output, path); string_list_append(&output, path);
continue; continue;
@ -1848,7 +1848,7 @@ static void wt_shortstatus_unmerged(struct string_list_item *it,
} else { } else {
struct strbuf onebuf = STRBUF_INIT; struct strbuf onebuf = STRBUF_INIT;
const char *one; const char *one;
one = quote_path(it->string, s->prefix, &onebuf); one = quote_path(it->string, s->prefix, &onebuf, 0);
printf(" %s\n", one); printf(" %s\n", one);
strbuf_release(&onebuf); strbuf_release(&onebuf);
} }
@ -1877,7 +1877,7 @@ static void wt_shortstatus_status(struct string_list_item *it,
const char *one; const char *one;
if (d->rename_source) { if (d->rename_source) {
one = quote_path(d->rename_source, s->prefix, &onebuf); one = quote_path(d->rename_source, s->prefix, &onebuf, 0);
if (*one != '"' && strchr(one, ' ') != NULL) { if (*one != '"' && strchr(one, ' ') != NULL) {
putchar('"'); putchar('"');
strbuf_addch(&onebuf, '"'); strbuf_addch(&onebuf, '"');
@ -1886,7 +1886,7 @@ static void wt_shortstatus_status(struct string_list_item *it,
printf("%s -> ", one); printf("%s -> ", one);
strbuf_release(&onebuf); strbuf_release(&onebuf);
} }
one = quote_path(it->string, s->prefix, &onebuf); one = quote_path(it->string, s->prefix, &onebuf, 0);
if (*one != '"' && strchr(one, ' ') != NULL) { if (*one != '"' && strchr(one, ' ') != NULL) {
putchar('"'); putchar('"');
strbuf_addch(&onebuf, '"'); strbuf_addch(&onebuf, '"');
@ -1905,7 +1905,7 @@ static void wt_shortstatus_other(struct string_list_item *it,
} else { } else {
struct strbuf onebuf = STRBUF_INIT; struct strbuf onebuf = STRBUF_INIT;
const char *one; const char *one;
one = quote_path(it->string, s->prefix, &onebuf); one = quote_path(it->string, s->prefix, &onebuf, 0);
color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign); color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
printf(" %s\n", one); printf(" %s\n", one);
strbuf_release(&onebuf); strbuf_release(&onebuf);
@ -2222,9 +2222,9 @@ static void wt_porcelain_v2_print_changed_entry(
*/ */
sep_char = '\t'; sep_char = '\t';
eol_char = '\n'; eol_char = '\n';
path = quote_path(it->string, s->prefix, &buf); path = quote_path(it->string, s->prefix, &buf, 0);
if (d->rename_source) if (d->rename_source)
path_from = quote_path(d->rename_source, s->prefix, &buf_from); path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
} }
if (path_from) if (path_from)
@ -2310,7 +2310,7 @@ static void wt_porcelain_v2_print_unmerged_entry(
if (s->null_termination) if (s->null_termination)
path_index = it->string; path_index = it->string;
else else
path_index = quote_path(it->string, s->prefix, &buf_index); path_index = quote_path(it->string, s->prefix, &buf_index, 0);
fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c", fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
unmerged_prefix, key, submodule_token, unmerged_prefix, key, submodule_token,
@ -2343,7 +2343,7 @@ static void wt_porcelain_v2_print_other(
path = it->string; path = it->string;
eol_char = '\0'; eol_char = '\0';
} else { } else {
path = quote_path(it->string, s->prefix, &buf); path = quote_path(it->string, s->prefix, &buf, 0);
eol_char = '\n'; eol_char = '\n';
} }