зеркало из https://github.com/microsoft/git.git
quote: turn 'nodq' parameter into a set of flags
quote_c_style() and its friend quote_two_c_style() both take an optional "please omit the double quotes around the quoted body" parameter. Turn it into a flag word, assign one bit out of it, and call it CQUOTE_NODQ bit. No behaviour change intended. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
dfc7f65c26
Коммит
7c37c9750a
8
diff.c
8
diff.c
|
@ -482,14 +482,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
|
||||||
|
|
||||||
static char *quote_two(const char *one, const char *two)
|
static char *quote_two(const char *one, const char *two)
|
||||||
{
|
{
|
||||||
int need_one = quote_c_style(one, NULL, NULL, 1);
|
int need_one = quote_c_style(one, NULL, NULL, CQUOTE_NODQ);
|
||||||
int need_two = quote_c_style(two, NULL, NULL, 1);
|
int need_two = quote_c_style(two, NULL, NULL, CQUOTE_NODQ);
|
||||||
struct strbuf res = STRBUF_INIT;
|
struct strbuf res = STRBUF_INIT;
|
||||||
|
|
||||||
if (need_one + need_two) {
|
if (need_one + need_two) {
|
||||||
strbuf_addch(&res, '"');
|
strbuf_addch(&res, '"');
|
||||||
quote_c_style(one, &res, NULL, 1);
|
quote_c_style(one, &res, NULL, CQUOTE_NODQ);
|
||||||
quote_c_style(two, &res, NULL, 1);
|
quote_c_style(two, &res, NULL, CQUOTE_NODQ);
|
||||||
strbuf_addch(&res, '"');
|
strbuf_addch(&res, '"');
|
||||||
} else {
|
} else {
|
||||||
strbuf_addstr(&res, one);
|
strbuf_addstr(&res, one);
|
||||||
|
|
18
quote.c
18
quote.c
|
@ -256,7 +256,7 @@ static size_t next_quote_pos(const char *s, ssize_t maxlen)
|
||||||
* Return value is the same as in (1).
|
* Return value is the same as in (1).
|
||||||
*/
|
*/
|
||||||
static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
|
static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
|
||||||
struct strbuf *sb, FILE *fp, int no_dq)
|
struct strbuf *sb, FILE *fp, unsigned flags)
|
||||||
{
|
{
|
||||||
#undef EMIT
|
#undef EMIT
|
||||||
#define EMIT(c) \
|
#define EMIT(c) \
|
||||||
|
@ -272,6 +272,7 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
|
||||||
count += (l); \
|
count += (l); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
int no_dq = !!(flags & CQUOTE_NODQ);
|
||||||
size_t len, count = 0;
|
size_t len, count = 0;
|
||||||
const char *p = name;
|
const char *p = name;
|
||||||
|
|
||||||
|
@ -309,19 +310,21 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t quote_c_style(const char *name, struct strbuf *sb, FILE *fp, int nodq)
|
size_t quote_c_style(const char *name, struct strbuf *sb, FILE *fp, unsigned flags)
|
||||||
{
|
{
|
||||||
return quote_c_style_counted(name, -1, sb, fp, nodq);
|
return quote_c_style_counted(name, -1, sb, fp, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
void quote_two_c_style(struct strbuf *sb, const char *prefix, const char *path, int nodq)
|
void quote_two_c_style(struct strbuf *sb, const char *prefix, const char *path,
|
||||||
|
unsigned flags)
|
||||||
{
|
{
|
||||||
|
int nodq = !!(flags & CQUOTE_NODQ);
|
||||||
if (quote_c_style(prefix, NULL, NULL, 0) ||
|
if (quote_c_style(prefix, NULL, NULL, 0) ||
|
||||||
quote_c_style(path, NULL, NULL, 0)) {
|
quote_c_style(path, NULL, NULL, 0)) {
|
||||||
if (!nodq)
|
if (!nodq)
|
||||||
strbuf_addch(sb, '"');
|
strbuf_addch(sb, '"');
|
||||||
quote_c_style(prefix, sb, NULL, 1);
|
quote_c_style(prefix, sb, NULL, CQUOTE_NODQ);
|
||||||
quote_c_style(path, sb, NULL, 1);
|
quote_c_style(path, sb, NULL, CQUOTE_NODQ);
|
||||||
if (!nodq)
|
if (!nodq)
|
||||||
strbuf_addch(sb, '"');
|
strbuf_addch(sb, '"');
|
||||||
} else {
|
} else {
|
||||||
|
@ -367,7 +370,8 @@ char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigne
|
||||||
*/
|
*/
|
||||||
if (force_dq)
|
if (force_dq)
|
||||||
strbuf_addch(out, '"');
|
strbuf_addch(out, '"');
|
||||||
quote_c_style_counted(rel, strlen(rel), out, NULL, force_dq);
|
quote_c_style_counted(rel, strlen(rel), out, NULL,
|
||||||
|
force_dq ? CQUOTE_NODQ : 0);
|
||||||
if (force_dq)
|
if (force_dq)
|
||||||
strbuf_addch(out, '"');
|
strbuf_addch(out, '"');
|
||||||
strbuf_release(&sb);
|
strbuf_release(&sb);
|
||||||
|
|
7
quote.h
7
quote.h
|
@ -64,8 +64,11 @@ struct strvec;
|
||||||
int sq_dequote_to_strvec(char *arg, struct strvec *);
|
int sq_dequote_to_strvec(char *arg, struct strvec *);
|
||||||
|
|
||||||
int unquote_c_style(struct strbuf *, const char *quoted, const char **endp);
|
int unquote_c_style(struct strbuf *, const char *quoted, const char **endp);
|
||||||
size_t quote_c_style(const char *name, struct strbuf *, FILE *, int no_dq);
|
|
||||||
void quote_two_c_style(struct strbuf *, const char *, const char *, int);
|
/* Bits in the flags parameter to quote_c_style() */
|
||||||
|
#define CQUOTE_NODQ 01
|
||||||
|
size_t quote_c_style(const char *name, struct strbuf *, FILE *, unsigned);
|
||||||
|
void quote_two_c_style(struct strbuf *, const char *, const char *, unsigned);
|
||||||
|
|
||||||
void write_name_quoted(const char *name, FILE *, int terminator);
|
void write_name_quoted(const char *name, FILE *, int terminator);
|
||||||
void write_name_quoted_relative(const char *name, const char *prefix,
|
void write_name_quoted_relative(const char *name, const char *prefix,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче