mktree: there are only two possible line terminations

The program by default reads LF terminated lines, with an option to
use NUL terminated records.  Instead of pretending that there can be
other useful values for line_termination, use a boolean variable,
nul_term_line, to tell if NUL terminated records are used, and
switch between strbuf_getline_{lf,nul} based on it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/mktree.c b/builtin/mktree.c
index a964d6be521c09a241ab0ccdc9f313e182769412..a237caacfdfc5905067bb6e3f9ae517b5f83ed17 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -65,7 +65,7 @@ static const char *mktree_usage[] = {
        NULL
 };
 
        NULL
 };
 

-static void mktree_line(char *buf, size_t len, int line_termination, int allow_missing)
+static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_missing)

 {
        char *ptr, *ntr;
        unsigned mode;
 {
        char *ptr, *ntr;
        unsigned mode;


@@ -97,7 +97,7 @@ static void mktree_line(char *buf, size_t len, int line_termination, int allow_m
        *ntr++ = 0; /* now at the beginning of SHA1 */
 
        path = ntr + 41;  /* at the beginning of name */
        *ntr++ = 0; /* now at the beginning of SHA1 */
 
        path = ntr + 41;  /* at the beginning of name */

-       if (line_termination && path[0] == '"') {
+       if (!nul_term_line && path[0] == '"') {

                struct strbuf p_uq = STRBUF_INIT;
                if (unquote_c_style(&p_uq, path, NULL))
                        die("invalid quoting");
                struct strbuf p_uq = STRBUF_INIT;
                if (unquote_c_style(&p_uq, path, NULL))
                        die("invalid quoting");


@@ -141,23 +141,25 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
 {
        struct strbuf sb = STRBUF_INIT;
        unsigned char sha1[20];
 {
        struct strbuf sb = STRBUF_INIT;
        unsigned char sha1[20];

-       int line_termination = '\n';
+       int nul_term_line = 0;

        int allow_missing = 0;
        int is_batch_mode = 0;
        int got_eof = 0;
        int allow_missing = 0;
        int is_batch_mode = 0;
        int got_eof = 0;

+       strbuf_getline_fn getline_fn;

 
        const struct option option[] = {
 
        const struct option option[] = {

-               OPT_SET_INT('z', NULL, &line_termination, N_("input is NUL terminated"), '\0'),
+               OPT_BOOL('z', NULL, &nul_term_line, N_("input is NUL terminated")),

                OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
                OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
                OPT_END()
        };
 
        ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
                OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
                OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
                OPT_END()
        };
 
        ac = parse_options(ac, av, prefix, option, mktree_usage, 0);

+       getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;

 
        while (!got_eof) {
                while (1) {
 
        while (!got_eof) {
                while (1) {

-                       if (strbuf_getline(&sb, stdin, line_termination) == EOF) {
+                       if (getline_fn(&sb, stdin) == EOF) {

                                got_eof = 1;
                                break;
                        }
                                got_eof = 1;
                                break;
                        }


@@ -167,7 +169,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
                                        break;
                                die("input format error: (blank line only valid in batch mode)");
                        }
                                        break;
                                die("input format error: (blank line only valid in batch mode)");
                        }

-                       mktree_line(sb.buf, sb.len, line_termination, allow_missing);
+                       mktree_line(sb.buf, sb.len, nul_term_line, allow_missing);

                }
                if (is_batch_mode && got_eof && used < 1) {
                        /*
                }
                if (is_batch_mode && got_eof && used < 1) {
                        /*