From 800531a8668710b5fa02b81360116f508888b58c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 11 Jul 2013 23:05:48 -0700 Subject: check-ignore: the name of the character is NUL, not NULL Signed-off-by: Junio C Hamano diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 0240f99..be22bce 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -12,7 +12,7 @@ static const char * const check_ignore_usage[] = { NULL }; -static int null_term_line; +static int nul_term_line; static const struct option check_ignore_options[] = { OPT__QUIET(&quiet, N_("suppress progress reporting")), @@ -20,8 +20,8 @@ static const struct option check_ignore_options[] = { OPT_GROUP(""), OPT_BOOLEAN(0, "stdin", &stdin_paths, N_("read file names from stdin")), - OPT_BOOLEAN('z', NULL, &null_term_line, - N_("input paths are terminated by a null character")), + OPT_BOOLEAN('z', NULL, &nul_term_line, + N_("input paths are terminated by a NUL character")), OPT_END() }; @@ -29,7 +29,7 @@ static void output_exclude(const char *path, struct exclude *exclude) { char *bang = exclude->flags & EXC_FLAG_NEGATIVE ? "!" : ""; char *slash = exclude->flags & EXC_FLAG_MUSTBEDIR ? "/" : ""; - if (!null_term_line) { + if (!nul_term_line) { if (!verbose) { write_name_quoted(path, stdout, '\n'); } else { @@ -111,7 +111,7 @@ static int check_ignore_stdin_paths(const char *prefix) struct strbuf buf, nbuf; char **pathspec = NULL; size_t nr = 0, alloc = 0; - int line_termination = null_term_line ? 0 : '\n'; + int line_termination = nul_term_line ? 0 : '\n'; int num_ignored; strbuf_init(&buf, 0); @@ -150,7 +150,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix) if (argc > 0) die(_("cannot specify pathnames with --stdin")); } else { - if (null_term_line) + if (nul_term_line) die(_("-z only makes sense with --stdin")); if (argc == 0) die(_("no path specified")); -- cgit v0.10.2-6-g49f6 From 94a55e4e9f15dbcd827ae0e6feeb951c66416366 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 11 Jul 2013 22:56:24 -0700 Subject: check-attr: the name of the character is NUL, not NULL Signed-off-by: Junio C Hamano diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 075d01d..7cc9b5d 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -13,14 +13,14 @@ N_("git check-attr --stdin [-z] [-a | --all | attr...] < "), NULL }; -static int null_term_line; +static int nul_term_line; static const struct option check_attr_options[] = { OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")), OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")), OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")), - OPT_BOOLEAN('z', NULL, &null_term_line, - N_("input paths are terminated by a null character")), + OPT_BOOLEAN('z', NULL, &nul_term_line, + N_("input paths are terminated by a NUL character")), OPT_END() }; @@ -65,7 +65,7 @@ static void check_attr_stdin_paths(const char *prefix, int cnt, struct git_attr_check *check) { struct strbuf buf, nbuf; - int line_termination = null_term_line ? 0 : '\n'; + int line_termination = nul_term_line ? 0 : '\n'; strbuf_init(&buf, 0); strbuf_init(&nbuf, 0); -- cgit v0.10.2-6-g49f6 From d6dcb92a1d462ef3f5739f4fd9b2000ba998f944 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 11 Jul 2013 23:07:02 -0700 Subject: check-ignore -z: a single -z should apply to both input and output Unless a command has separate --nul-terminated-{input,output} options, the --nul-terminated-records (-z) option should apply to both input and output for consistency. The caller knows that its input paths may need to be protected for LF, and the program shows these problematic paths to its output. The code already did the right thing. Only the help text needs fixing. Signed-off-by: Junio C Hamano diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index be22bce..03e509e 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -21,7 +21,7 @@ static const struct option check_ignore_options[] = { OPT_BOOLEAN(0, "stdin", &stdin_paths, N_("read file names from stdin")), OPT_BOOLEAN('z', NULL, &nul_term_line, - N_("input paths are terminated by a NUL character")), + N_("terminate input and output records by a NUL character")), OPT_END() }; -- cgit v0.10.2-6-g49f6 From f7cd8c50b9ab83e084e8f52653ecc8d90665eef2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 11 Jul 2013 23:02:40 -0700 Subject: check-attr -z: a single -z should apply to both input and output Unless a command has separate --nul-terminated-{input,output} options, the --nul-terminated-records (-z) option should apply to both input and output for consistency. The caller knows that its input paths may need to be protected for LF, and the program shows these problematic paths to its output. Signed-off-by: Junio C Hamano diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt index 5abdbaa..760aca9 100644 --- a/Documentation/git-check-attr.txt +++ b/Documentation/git-check-attr.txt @@ -31,8 +31,9 @@ OPTIONS Read file names from stdin instead of from the command-line. -z:: - Only meaningful with `--stdin`; paths are separated with a - NUL character instead of a linefeed character. + The output format is modified to be machine-parseable. + If `--stdin` is also given, input paths are separated + with a NUL character instead of a linefeed character. \--:: Interpret all preceding arguments as attributes and all following @@ -48,6 +49,10 @@ OUTPUT The output is of the form: COLON SP COLON SP LF +unless `-z` is in effect, in which case NUL is used as delimiter: + NUL NUL NUL + + is the path of a file being queried, is an attribute being queried and can be either: diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 7cc9b5d..cd46690 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -20,7 +20,7 @@ static const struct option check_attr_options[] = { OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")), OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")), OPT_BOOLEAN('z', NULL, &nul_term_line, - N_("input paths are terminated by a NUL character")), + N_("terminate input and output records by a NUL character")), OPT_END() }; @@ -38,8 +38,16 @@ static void output_attr(int cnt, struct git_attr_check *check, else if (ATTR_UNSET(value)) value = "unspecified"; - quote_c_style(file, NULL, stdout, 0); - printf(": %s: %s\n", git_attr_name(check[j].attr), value); + if (nul_term_line) { + printf("%s%c" /* path */ + "%s%c" /* attrname */ + "%s%c" /* attrvalue */, + file, 0, git_attr_name(check[j].attr), 0, value, 0); + } else { + quote_c_style(file, NULL, stdout, 0); + printf(": %s: %s\n", git_attr_name(check[j].attr), value); + } + } } -- cgit v0.10.2-6-g49f6