strbuf: introduce strbuf_getline_{lf,nul}()

The strbuf_getline() interface allows a byte other than LF or NUL as
the line terminator, but this is only because I wrote these
codepaths anticipating that there might be a value other than NUL
and LF that could be useful when I introduced line_termination long
time ago.  No useful caller that uses other value has emerged.

By now, it is clear that the interface is overly broad without a
good reason.  Many codepaths have hardcoded preference to read
either LF terminated or NUL terminated records from their input, and
then call strbuf_getline() with LF or NUL as the third parameter.

This step introduces two thin wrappers around strbuf_getline(),
namely, strbuf_getline_lf() and strbuf_getline_nul(), and
mechanically rewrites these call sites to call either one of
them.  The changes contained in this patch are:

* introduction of these two functions in strbuf.[ch]

* mechanical conversion of all callers to strbuf_getline() with
either '\n' or '\0' as the third parameter to instead call the
respective thin wrapper.

After this step, output from "git grep 'strbuf_getline('" would
become a lot smaller.  An interim goal of this series is to make
this an empty set, so that we can have strbuf_getline_crlf() take
over the shorter name strbuf_getline().

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

diff --git a/bisect.c b/bisect.c
index 42aa7aa6aa1e53e66bafd47d76b783514dcfabf1..06ec54e599586f7cfe0f08c4b63354900af33d18 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -440,7 +440,7 @@ static void read_bisect_paths(struct argv_array *array)
        if (!fp)
                die_errno("Could not open file '%s'", filename);
 
        if (!fp)
                die_errno("Could not open file '%s'", filename);
 

-       while (strbuf_getline(&str, fp, '\n') != EOF) {
+       while (strbuf_getline_lf(&str, fp) != EOF) {

                strbuf_trim(&str);
                if (sq_dequote_to_argv_array(str.buf, array))
                        die("Badly quoted content in file '%s': %s",
                strbuf_trim(&str);
                if (sq_dequote_to_argv_array(str.buf, array))
                        die("Badly quoted content in file '%s': %s",


@@ -668,7 +668,7 @@ static int is_expected_rev(const struct object_id *oid)
        if (!fp)
                return 0;
 
        if (!fp)
                return 0;
 

-       if (strbuf_getline(&str, fp, '\n') != EOF)
+       if (strbuf_getline_lf(&str, fp) != EOF)

                res = !strcmp(str.buf, oid_to_hex(oid));
 
        strbuf_release(&str);
                res = !strcmp(str.buf, oid_to_hex(oid));
 
        strbuf_release(&str);


@@ -914,9 +914,9 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
                                strerror(errno));
                }
        } else {
                                strerror(errno));
                }
        } else {

-               strbuf_getline(&str, fp, '\n');
+               strbuf_getline_lf(&str, fp);

                *read_bad = strbuf_detach(&str, NULL);
                *read_bad = strbuf_detach(&str, NULL);

-               strbuf_getline(&str, fp, '\n');
+               strbuf_getline_lf(&str, fp);

                *read_good = strbuf_detach(&str, NULL);
        }
        strbuf_release(&str);
                *read_good = strbuf_detach(&str, NULL);
        }
        strbuf_release(&str);

diff --git a/builtin/am.c b/builtin/am.c
index d96735c0be732b59115f6e94501059af210599ec..9063a4ac2c8a31b9e5df9f10b0ff3bda971d899b 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -269,7 +269,7 @@ static char *read_shell_var(FILE *fp, const char *key)
        struct strbuf sb = STRBUF_INIT;
        const char *str;
 
        struct strbuf sb = STRBUF_INIT;
        const char *str;
 

-       if (strbuf_getline(&sb, fp, '\n'))
+       if (strbuf_getline_lf(&sb, fp))

                goto fail;
 
        if (!skip_prefix(sb.buf, key, &str))
                goto fail;
 
        if (!skip_prefix(sb.buf, key, &str))


@@ -558,7 +558,7 @@ static int copy_notes_for_rebase(const struct am_state *state)
 
        fp = xfopen(am_path(state, "rewritten"), "r");
 
 
        fp = xfopen(am_path(state, "rewritten"), "r");
 

-       while (!strbuf_getline(&sb, fp, '\n')) {
+       while (!strbuf_getline_lf(&sb, fp)) {

                unsigned char from_obj[GIT_SHA1_RAWSZ], to_obj[GIT_SHA1_RAWSZ];
 
                if (sb.len != GIT_SHA1_HEXSZ * 2 + 1) {
                unsigned char from_obj[GIT_SHA1_RAWSZ], to_obj[GIT_SHA1_RAWSZ];
 
                if (sb.len != GIT_SHA1_HEXSZ * 2 + 1) {


@@ -802,7 +802,7 @@ static int stgit_patch_to_mail(FILE *out, FILE *in, int keep_cr)
        struct strbuf sb = STRBUF_INIT;
        int subject_printed = 0;
 
        struct strbuf sb = STRBUF_INIT;
        int subject_printed = 0;
 

-       while (!strbuf_getline(&sb, in, '\n')) {
+       while (!strbuf_getline_lf(&sb, in)) {

                const char *str;
 
                if (str_isspace(sb.buf))
                const char *str;
 
                if (str_isspace(sb.buf))


@@ -860,7 +860,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
                return error(_("could not open '%s' for reading: %s"), *paths,
                                strerror(errno));
 
                return error(_("could not open '%s' for reading: %s"), *paths,
                                strerror(errno));
 

-       while (!strbuf_getline(&sb, fp, '\n')) {
+       while (!strbuf_getline_lf(&sb, fp)) {

                if (*sb.buf == '#')
                        continue; /* skip comment lines */
 
                if (*sb.buf == '#')
                        continue; /* skip comment lines */
 


@@ -885,7 +885,7 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 {
        struct strbuf sb = STRBUF_INIT;
 
 {
        struct strbuf sb = STRBUF_INIT;
 

-       while (!strbuf_getline(&sb, in, '\n')) {
+       while (!strbuf_getline_lf(&sb, in)) {

                const char *str;
 
                if (skip_prefix(sb.buf, "# User ", &str))
                const char *str;
 
                if (skip_prefix(sb.buf, "# User ", &str))


@@ -1302,7 +1302,7 @@ static int parse_mail(struct am_state *state, const char *mail)
 
        /* Extract message and author information */
        fp = xfopen(am_path(state, "info"), "r");
 
        /* Extract message and author information */
        fp = xfopen(am_path(state, "info"), "r");

-       while (!strbuf_getline(&sb, fp, '\n')) {
+       while (!strbuf_getline_lf(&sb, fp)) {

                const char *x;
 
                if (skip_prefix(sb.buf, "Subject: ", &x)) {
                const char *x;
 
                if (skip_prefix(sb.buf, "Subject: ", &x)) {


@@ -1368,7 +1368,7 @@ static int get_mail_commit_sha1(unsigned char *commit_id, const char *mail)
        FILE *fp = xfopen(mail, "r");
        const char *x;
 
        FILE *fp = xfopen(mail, "r");
        const char *x;
 

-       if (strbuf_getline(&sb, fp, '\n'))
+       if (strbuf_getline_lf(&sb, fp))

                return -1;
 
        if (!skip_prefix(sb.buf, "From ", &x))
                return -1;
 
        if (!skip_prefix(sb.buf, "From ", &x))

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index c0fd8dbb1c1bed55f541569e0c13cc865c39ec4f..d2ebaf1f5857bbcc5f2a802472824a75ce5d5ccf 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -401,7 +401,7 @@ static int batch_objects(struct batch_options *opt)
        save_warning = warn_on_object_refname_ambiguity;
        warn_on_object_refname_ambiguity = 0;
 
        save_warning = warn_on_object_refname_ambiguity;
        warn_on_object_refname_ambiguity = 0;
 

-       while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+       while (strbuf_getline_lf(&buf, stdin) != EOF) {

                if (data.split_on_whitespace) {
                        /*
                         * Split at first whitespace, tying off the beginning
                if (data.split_on_whitespace) {
                        /*
                         * Split at first whitespace, tying off the beginning

diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index eaaea546d30871ad7442456f7eec4ae849f68374..cf0f54f6b92ec8db45158c43ad164413ec4a1333 100644 (file)
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -54,7 +54,7 @@ int cmd_check_mailmap(int argc, const char **argv, const char *prefix)
 
        if (use_stdin) {
                struct strbuf buf = STRBUF_INIT;
 
        if (use_stdin) {
                struct strbuf buf = STRBUF_INIT;

-               while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+               while (strbuf_getline_lf(&buf, stdin) != EOF) {

                        check_mailmap(&mailmap, buf.buf);
                        maybe_flush_or_die(stdout, "stdout");
                }
                        check_mailmap(&mailmap, buf.buf);
                        maybe_flush_or_die(stdout, "stdout");
                }

diff --git a/builtin/clean.c b/builtin/clean.c
index d7acb94a9594563b1473ecac29bd5de9a5e8a55a..cc5f9723dead24b528c676ae06af4ed152c9d2e6 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -594,7 +594,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff)
                               clean_get_color(CLEAN_COLOR_RESET));
                }
 
                               clean_get_color(CLEAN_COLOR_RESET));
                }
 

-               if (strbuf_getline(&choice, stdin, '\n') != EOF) {
+               if (strbuf_getline_lf(&choice, stdin) != EOF) {

                        strbuf_trim(&choice);
                } else {
                        eof = 1;
                        strbuf_trim(&choice);
                } else {
                        eof = 1;


@@ -676,7 +676,7 @@ static int filter_by_patterns_cmd(void)
                clean_print_color(CLEAN_COLOR_PROMPT);
                printf(_("Input ignore patterns>> "));
                clean_print_color(CLEAN_COLOR_RESET);
                clean_print_color(CLEAN_COLOR_PROMPT);
                printf(_("Input ignore patterns>> "));
                clean_print_color(CLEAN_COLOR_RESET);

-               if (strbuf_getline(&confirm, stdin, '\n') != EOF)
+               if (strbuf_getline_lf(&confirm, stdin) != EOF)

                        strbuf_trim(&confirm);
                else
                        putchar('\n');
                        strbuf_trim(&confirm);
                else
                        putchar('\n');


@@ -774,7 +774,7 @@ static int ask_each_cmd(void)
                        qname = quote_path_relative(item->string, NULL, &buf);
                        /* TRANSLATORS: Make sure to keep [y/N] as is */
                        printf(_("Remove %s [y/N]? "), qname);
                        qname = quote_path_relative(item->string, NULL, &buf);
                        /* TRANSLATORS: Make sure to keep [y/N] as is */
                        printf(_("Remove %s [y/N]? "), qname);

-                       if (strbuf_getline(&confirm, stdin, '\n') != EOF) {
+                       if (strbuf_getline_lf(&confirm, stdin) != EOF) {

                                strbuf_trim(&confirm);
                        } else {
                                putchar('\n');
                                strbuf_trim(&confirm);
                        } else {
                                putchar('\n');

diff --git a/builtin/clone.c b/builtin/clone.c
index a0b3cd9e5617b5a3a45dd01c8a2c7af0b2fd9668..29741f44460a6648557ffe4619e71ca64cef3e63 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -339,7 +339,7 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst,
        FILE *in = fopen(src->buf, "r");
        struct strbuf line = STRBUF_INIT;
 
        FILE *in = fopen(src->buf, "r");
        struct strbuf line = STRBUF_INIT;
 

-       while (strbuf_getline(&line, in, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, in) != EOF) {

                char *abs_path;
                if (!line.len || line.buf[0] == '#')
                        continue;
                char *abs_path;
                if (!line.len || line.buf[0] == '#')
                        continue;

diff --git a/builtin/column.c b/builtin/column.c
index 449413c8a873ebcfa2ceaccae6b89a3f1245c117..40eab085946a46b5cbace46ab9dbd8778564cd6f 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -51,7 +51,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
                        die(_("--command must be the first argument"));
        }
        finalize_colopts(&colopts, -1);
                        die(_("--command must be the first argument"));
        }
        finalize_colopts(&colopts, -1);

-       while (!strbuf_getline(&sb, stdin, '\n'))
+       while (!strbuf_getline_lf(&sb, stdin))

                string_list_append(&list, sb.buf);
 
        print_columns(&list, colopts, &copts);
                string_list_append(&list, sb.buf);
 
        print_columns(&list, colopts, &copts);

diff --git a/builtin/commit.c b/builtin/commit.c
index d054f849606b248a82f7b29103308feab36ca9e9..d9db59e1d275fbe0fac5c3ca461d8fdec3adcf2e 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1690,7 +1690,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                if (fp == NULL)
                        die_errno(_("could not open '%s' for reading"),
                                  git_path_merge_head());
                if (fp == NULL)
                        die_errno(_("could not open '%s' for reading"),
                                  git_path_merge_head());

-               while (strbuf_getline(&m, fp, '\n') != EOF) {
+               while (strbuf_getline_lf(&m, fp) != EOF) {

                        struct commit *parent;
 
                        parent = get_merge_parent(m.buf);
                        struct commit *parent;
 
                        parent = get_merge_parent(m.buf);

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index cf3019e05bdf45e1fa16a483621a6773976f98c5..9b2a514e1d787784c2fac8d844d58013b6091aa6 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -158,7 +158,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
                else {
                        /* read from stdin one ref per line, until EOF */
                        struct strbuf line = STRBUF_INIT;
                else {
                        /* read from stdin one ref per line, until EOF */
                        struct strbuf line = STRBUF_INIT;

-                       while (strbuf_getline(&line, stdin, '\n') != EOF)
+                       while (strbuf_getline_lf(&line, stdin) != EOF)

                                add_sought_entry(&sought, &nr_sought, &alloc_sought, line.buf);
                        strbuf_release(&line);
                }
                                add_sought_entry(&sought, &nr_sought, &alloc_sought, line.buf);
                        strbuf_release(&line);
                }

diff --git a/builtin/grep.c b/builtin/grep.c
index 4229cae390ddddcc74f3506dc892ed02b45d7eae..5a5beb810954afcf98d27a9615f2380f7e8b06c4 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -562,7 +562,7 @@ static int file_callback(const struct option *opt, const char *arg, int unset)
        patterns = from_stdin ? stdin : fopen(arg, "r");
        if (!patterns)
                die_errno(_("cannot open '%s'"), arg);
        patterns = from_stdin ? stdin : fopen(arg, "r");
        if (!patterns)
                die_errno(_("cannot open '%s'"), arg);

-       while (strbuf_getline(&sb, patterns, '\n') == 0) {
+       while (strbuf_getline_lf(&sb, patterns) == 0) {

                /* ignore empty line like grep does */
                if (sb.len == 0)
                        continue;
                /* ignore empty line like grep does */
                if (sb.len == 0)
                        continue;

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 43b098b76c0db28a93c6b1ebf1ea1131b0d67a0b..3bc5ec1d2194133fd392ca5bfbaaa5a26b901e5f 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -60,7 +60,7 @@ static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
 {
        struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
 
 {
        struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
 

-       while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+       while (strbuf_getline_lf(&buf, stdin) != EOF) {

                if (buf.buf[0] == '"') {
                        strbuf_reset(&nbuf);
                        if (unquote_c_style(&nbuf, buf.buf, NULL))
                if (buf.buf[0] == '"') {
                        strbuf_reset(&nbuf);
                        if (unquote_c_style(&nbuf, buf.buf, NULL))

diff --git a/builtin/notes.c b/builtin/notes.c
index 52aa9af74be8d47780d4762185c5cbe09624b382..3775e389635a58f20538b621fd22980a38b78b0d 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -290,7 +290,7 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
                t = &default_notes_tree;
        }
 
                t = &default_notes_tree;
        }
 

-       while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+       while (strbuf_getline_lf(&buf, stdin) != EOF) {

                unsigned char from_obj[20], to_obj[20];
                struct strbuf **split;
                int err;
                unsigned char from_obj[20], to_obj[20];
                struct strbuf **split;
                int err;

diff --git a/builtin/pull.c b/builtin/pull.c
index 5145fc60a0377a7fb799555892909f979aca9076..52606a84cebf1421f5378233d1915df5233c8737 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -378,7 +378,7 @@ static void get_merge_heads(struct sha1_array *merge_heads)
 
        if (!(fp = fopen(filename, "r")))
                die_errno(_("could not open '%s' for reading"), filename);
 
        if (!(fp = fopen(filename, "r")))
                die_errno(_("could not open '%s' for reading"), filename);

-       while (strbuf_getline(&sb, fp, '\n') != EOF) {
+       while (strbuf_getline_lf(&sb, fp) != EOF) {

                if (get_sha1_hex(sb.buf, sha1))
                        continue;  /* invalid line: does not start with SHA1 */
                if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
                if (get_sha1_hex(sb.buf, sha1))
                        continue;  /* invalid line: does not start with SHA1 */
                if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))

diff --git a/builtin/repack.c b/builtin/repack.c
index 945611006a4ddcad1b834d87fe62698549ebb837..858db38f52e878a41cefdd47bbafd1250c7483b0 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -266,7 +266,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                return ret;
 
        out = xfdopen(cmd.out, "r");
                return ret;
 
        out = xfdopen(cmd.out, "r");

-       while (strbuf_getline(&line, out, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, out) != EOF) {

                if (line.len != 40)
                        die("repack: Expecting 40 character sha1 lines only from pack-objects.");
                string_list_append(&names, line.buf);
                if (line.len != 40)
                        die("repack: Expecting 40 character sha1 lines only from pack-objects.");
                string_list_append(&names, line.buf);

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 7e074aad408ee7d63d86643878ff5c5bb311f732..0324abb74972c48e585070ba19664a4eca45c244 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -383,7 +383,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 
        /* get the usage up to the first line with a -- on it */
        for (;;) {
 
        /* get the usage up to the first line with a -- on it */
        for (;;) {

-               if (strbuf_getline(&sb, stdin, '\n') == EOF)
+               if (strbuf_getline_lf(&sb, stdin) == EOF)

                        die("premature end of input");
                ALLOC_GROW(usage, unb + 1, usz);
                if (!strcmp("--", sb.buf)) {
                        die("premature end of input");
                ALLOC_GROW(usage, unb + 1, usz);
                if (!strcmp("--", sb.buf)) {


@@ -396,7 +396,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
        }
 
        /* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */
        }
 
        /* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */

-       while (strbuf_getline(&sb, stdin, '\n') != EOF) {
+       while (strbuf_getline_lf(&sb, stdin) != EOF) {

                const char *s;
                const char *help;
                struct option *o;
                const char *s;
                const char *help;
                struct option *o;

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index f6e5d643c193d28b14107bf9a9e4ee7aa36ca933..8f9f4f148d7c0d99c0e09e99ddff29798b6c4789 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -212,7 +212,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                                argv_array_push(&all_refspecs, buf);
                } else {
                        struct strbuf line = STRBUF_INIT;
                                argv_array_push(&all_refspecs, buf);
                } else {
                        struct strbuf line = STRBUF_INIT;

-                       while (strbuf_getline(&line, stdin, '\n') != EOF)
+                       while (strbuf_getline_lf(&line, stdin) != EOF)

                                argv_array_push(&all_refspecs, line.buf);
                        strbuf_release(&line);
                }
                                argv_array_push(&all_refspecs, line.buf);
                        strbuf_release(&line);
                }

diff --git a/compat/terminal.c b/compat/terminal.c
index 313897d581f0c5f2eae4d09b82d6ff8b98a21ea4..fa13ee672db33ef2fbcc16295230b99aa9d4f595 100644 (file)
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -122,7 +122,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
        fputs(prompt, output_fh);
        fflush(output_fh);
 
        fputs(prompt, output_fh);
        fflush(output_fh);
 

-       r = strbuf_getline(&buf, input_fh, '\n');
+       r = strbuf_getline_lf(&buf, input_fh);

        if (!echo) {
                putc('\n', output_fh);
                fflush(output_fh);
        if (!echo) {
                putc('\n', output_fh);
                fflush(output_fh);

diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 9365f2ce5c188d86b1b60029e4549e1bd844214f..cc65a9c0d342aa51d4b307fe10c626d940e2f211 100644 (file)
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -96,12 +96,12 @@ static int read_request(FILE *fh, struct credential *c,
        static struct strbuf item = STRBUF_INIT;
        const char *p;
 
        static struct strbuf item = STRBUF_INIT;
        const char *p;
 

-       strbuf_getline(&item, fh, '\n');
+       strbuf_getline_lf(&item, fh);

        if (!skip_prefix(item.buf, "action=", &p))
                return error("client sent bogus action line: %s", item.buf);
        strbuf_addstr(action, p);
 
        if (!skip_prefix(item.buf, "action=", &p))
                return error("client sent bogus action line: %s", item.buf);
        strbuf_addstr(action, p);
 

-       strbuf_getline(&item, fh, '\n');
+       strbuf_getline_lf(&item, fh);

        if (!skip_prefix(item.buf, "timeout=", &p))
                return error("client sent bogus timeout line: %s", item.buf);
        *timeout = atoi(p);
        if (!skip_prefix(item.buf, "timeout=", &p))
                return error("client sent bogus timeout line: %s", item.buf);
        *timeout = atoi(p);

diff --git a/credential-store.c b/credential-store.c
index 54c4e047373757598f6de7bf994251f0169b2b38..57141679abdaa804282a0cc2d808e7c6687d924a 100644 (file)
--- a/credential-store.c
+++ b/credential-store.c
@@ -23,7 +23,7 @@ static int parse_credential_file(const char *fn,
                return found_credential;
        }
 
                return found_credential;
        }
 

-       while (strbuf_getline(&line, fh, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, fh) != EOF) {

                credential_from_url(&entry, line.buf);
                if (entry.username && entry.password &&
                    credential_match(c, &entry)) {
                credential_from_url(&entry, line.buf);
                if (entry.username && entry.password &&
                    credential_match(c, &entry)) {

diff --git a/credential.c b/credential.c
index b146ad8481b133892a542691c7e36f5e7974cfdc..7d6501d190a529933d501e7f7006a70c4897282b 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -142,7 +142,7 @@ int credential_read(struct credential *c, FILE *fp)
 {
        struct strbuf line = STRBUF_INIT;
 
 {
        struct strbuf line = STRBUF_INIT;
 

-       while (strbuf_getline(&line, fp, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, fp) != EOF) {

                char *key = line.buf;
                char *value = strchr(key, '=');
 
                char *key = line.buf;
                char *value = strchr(key, '=');
 

diff --git a/daemon.c b/daemon.c
index be70cd4da09ccab8850be41e19b0fc4b9a10f502..46b411c7d941ecf862b7a7ffdce38ef8767e29e4 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -424,7 +424,7 @@ static void copy_to_log(int fd)
                return;
        }
 
                return;
        }
 

-       while (strbuf_getline(&line, fp, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, fp) != EOF) {

                logerror("%s", line.buf);
                strbuf_setlen(&line, 0);
        }
                logerror("%s", line.buf);
                strbuf_setlen(&line, 0);
        }

diff --git a/fast-import.c b/fast-import.c
index 3c65edb5c44e1fa57beef851d56a9674a5be1b72..bf01b3422142d6be204a983a9909efdb29d385d0 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1888,7 +1888,7 @@ static int read_next_command(void)
                        struct recent_command *rc;
 
                        strbuf_detach(&command_buf, NULL);
                        struct recent_command *rc;
 
                        strbuf_detach(&command_buf, NULL);

-                       stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
+                       stdin_eof = strbuf_getline_lf(&command_buf, stdin);

                        if (stdin_eof)
                                return EOF;
 
                        if (stdin_eof)
                                return EOF;
 


@@ -1960,7 +1960,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
 
                strbuf_detach(&command_buf, NULL);
                for (;;) {
 
                strbuf_detach(&command_buf, NULL);
                for (;;) {

-                       if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
+                       if (strbuf_getline_lf(&command_buf, stdin) == EOF)

                                die("EOF in data (terminator '%s' not found)", term);
                        if (term_len == command_buf.len
                                && !strcmp(term, command_buf.buf))
                                die("EOF in data (terminator '%s' not found)", term);
                        if (term_len == command_buf.len
                                && !strcmp(term, command_buf.buf))

diff --git a/ident.c b/ident.c
index daf7e1ea8370e5b6a60c5a33a1591ef939655664..9dd3ae34525563fef5d6c6f0e40b2bc593080063 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -76,7 +76,7 @@ static int add_mailname_host(struct strbuf *buf)
                                strerror(errno));
                return -1;
        }
                                strerror(errno));
                return -1;
        }

-       if (strbuf_getline(&mailnamebuf, mailname, '\n') == EOF) {
+       if (strbuf_getline_lf(&mailnamebuf, mailname) == EOF) {

                if (ferror(mailname))
                        warning("cannot read /etc/mailname: %s",
                                strerror(errno));
                if (ferror(mailname))
                        warning("cannot read /etc/mailname: %s",
                                strerror(errno));

diff --git a/mailinfo.c b/mailinfo.c
index f289941f7e516be2f6265326188b3d8da70ef3aa..9f19ca10805a5f54a49b3a8fa2093f583bcea8c3 100644 (file)
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -732,7 +732,7 @@ static int read_one_header_line(struct strbuf *line, FILE *in)
        struct strbuf continuation = STRBUF_INIT;
 
        /* Get the first part of the line. */
        struct strbuf continuation = STRBUF_INIT;
 
        /* Get the first part of the line. */

-       if (strbuf_getline(line, in, '\n'))
+       if (strbuf_getline_lf(line, in))

                return 0;
 
        /*
                return 0;
 
        /*


@@ -756,7 +756,7 @@ static int read_one_header_line(struct strbuf *line, FILE *in)
                peek = fgetc(in); ungetc(peek, in);
                if (peek != ' ' && peek != '\t')
                        break;
                peek = fgetc(in); ungetc(peek, in);
                if (peek != ' ' && peek != '\t')
                        break;

-               if (strbuf_getline(&continuation, in, '\n'))
+               if (strbuf_getline_lf(&continuation, in))

                        break;
                continuation.buf[0] = ' ';
                strbuf_rtrim(&continuation);
                        break;
                continuation.buf[0] = ' ';
                strbuf_rtrim(&continuation);


@@ -769,7 +769,7 @@ static int read_one_header_line(struct strbuf *line, FILE *in)
 
 static int find_boundary(struct mailinfo *mi, struct strbuf *line)
 {
 
 static int find_boundary(struct mailinfo *mi, struct strbuf *line)
 {

-       while (!strbuf_getline(line, mi->input, '\n')) {
+       while (!strbuf_getline_lf(line, mi->input)) {

                if (*(mi->content_top) && is_multipart_boundary(mi, line))
                        return 1;
        }
                if (*(mi->content_top) && is_multipart_boundary(mi, line))
                        return 1;
        }


@@ -820,7 +820,7 @@ static int handle_boundary(struct mailinfo *mi, struct strbuf *line)
 
        strbuf_release(&newline);
        /* replenish line */
 
        strbuf_release(&newline);
        /* replenish line */

-       if (strbuf_getline(line, mi->input, '\n'))
+       if (strbuf_getline_lf(line, mi->input))

                return 0;
        strbuf_addch(line, '\n');
        return 1;
                return 0;
        strbuf_addch(line, '\n');
        return 1;

diff --git a/remote-curl.c b/remote-curl.c
index f404faf0f4b9ec298ccbae34fae0c79283884d26..c7048575fbdca1bd8dc57c114d0cfdc031e63039 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -827,7 +827,7 @@ static void parse_fetch(struct strbuf *buf)
                        die("http transport does not support %s", buf->buf);
 
                strbuf_reset(buf);
                        die("http transport does not support %s", buf->buf);
 
                strbuf_reset(buf);

-               if (strbuf_getline(buf, stdin, '\n') == EOF)
+               if (strbuf_getline_lf(buf, stdin) == EOF)

                        return;
                if (!*buf->buf)
                        break;
                        return;
                if (!*buf->buf)
                        break;


@@ -940,7 +940,7 @@ static void parse_push(struct strbuf *buf)
                        die("http transport does not support %s", buf->buf);
 
                strbuf_reset(buf);
                        die("http transport does not support %s", buf->buf);
 
                strbuf_reset(buf);

-               if (strbuf_getline(buf, stdin, '\n') == EOF)
+               if (strbuf_getline_lf(buf, stdin) == EOF)

                        goto free_specs;
                if (!*buf->buf)
                        break;
                        goto free_specs;
                if (!*buf->buf)
                        break;


@@ -990,7 +990,7 @@ int main(int argc, const char **argv)
        do {
                const char *arg;
 
        do {
                const char *arg;
 

-               if (strbuf_getline(&buf, stdin, '\n') == EOF) {
+               if (strbuf_getline_lf(&buf, stdin) == EOF) {

                        if (ferror(stdin))
                                error("remote-curl: error reading command stream from git");
                        return 1;
                        if (ferror(stdin))
                                error("remote-curl: error reading command stream from git");
                        return 1;

diff --git a/remote-testsvn.c b/remote-testsvn.c
index f599c372c64dd8930f9640e9503f73c5edaff49c..f05ff45298207258c257c2118206fbbfa0a4c670 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -154,7 +154,7 @@ static void check_or_regenerate_marks(int latestrev)
                fclose(marksfile);
        } else {
                strbuf_addf(&sb, ":%d ", latestrev);
                fclose(marksfile);
        } else {
                strbuf_addf(&sb, ":%d ", latestrev);

-               while (strbuf_getline(&line, marksfile, '\n') != EOF) {
+               while (strbuf_getline_lf(&line, marksfile) != EOF) {

                        if (starts_with(line.buf, sb.buf)) {
                                found++;
                                break;
                        if (starts_with(line.buf, sb.buf)) {
                                found++;
                                break;


@@ -322,7 +322,7 @@ int main(int argc, char **argv)
        marksfilename = marksfilename_sb.buf;
 
        while (1) {
        marksfilename = marksfilename_sb.buf;
 
        while (1) {

-               if (strbuf_getline(&buf, stdin, '\n') == EOF) {
+               if (strbuf_getline_lf(&buf, stdin) == EOF) {

                        if (ferror(stdin))
                                die("Error reading command stream");
                        else
                        if (ferror(stdin))
                                die("Error reading command stream");
                        else

diff --git a/remote.c b/remote.c
index 9d34b5a5dafa217e2ce9cb1b7e9a4ab74908f7af..f19569385e8d161c75ff45824fd282e1ee6a4c80 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -256,7 +256,7 @@ static void read_remotes_file(struct remote *remote)
        if (!f)
                return;
        remote->origin = REMOTE_REMOTES;
        if (!f)
                return;
        remote->origin = REMOTE_REMOTES;

-       while (strbuf_getline(&buf, f, '\n') != EOF) {
+       while (strbuf_getline_lf(&buf, f) != EOF) {

                const char *v;
 
                strbuf_rtrim(&buf);
                const char *v;
 
                strbuf_rtrim(&buf);


@@ -281,7 +281,7 @@ static void read_branches_file(struct remote *remote)
        if (!f)
                return;
 
        if (!f)
                return;
 

-       strbuf_getline(&buf, f, '\n');
+       strbuf_getline_lf(&buf, f);

        fclose(f);
        strbuf_trim(&buf);
        if (!buf.len) {
        fclose(f);
        strbuf_trim(&buf);
        if (!buf.len) {

diff --git a/sequencer.c b/sequencer.c
index 8c58fa2f4ddaaadb09a63ef5a1937b4282ed988a..80487860c8fc5c79e3ffd4fbe21a0a0ea7e385ca 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -886,7 +886,7 @@ static int sequencer_rollback(struct replay_opts *opts)
        if (!f)
                return error(_("cannot open %s: %s"), git_path_head_file(),
                                                strerror(errno));
        if (!f)
                return error(_("cannot open %s: %s"), git_path_head_file(),
                                                strerror(errno));

-       if (strbuf_getline(&buf, f, '\n')) {
+       if (strbuf_getline_lf(&buf, f)) {

                error(_("cannot read %s: %s"), git_path_head_file(),
                      ferror(f) ?  strerror(errno) : _("unexpected end of file"));
                fclose(f);
                error(_("cannot read %s: %s"), git_path_head_file(),
                      ferror(f) ?  strerror(errno) : _("unexpected end of file"));
                fclose(f);

diff --git a/sha1_file.c b/sha1_file.c
index 73ccd49a465b1cf8b668edf8c13ea75d6b8de718..86b5e8cf724a771e1b18630793a3ff488c904bbc 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -396,7 +396,7 @@ void add_to_alternates_file(const char *reference)
                struct strbuf line = STRBUF_INIT;
                int found = 0;
 
                struct strbuf line = STRBUF_INIT;
                int found = 0;
 

-               while (strbuf_getline(&line, in, '\n') != EOF) {
+               while (strbuf_getline_lf(&line, in) != EOF) {

                        if (!strcmp(reference, line.buf)) {
                                found = 1;
                                break;
                        if (!strcmp(reference, line.buf)) {
                                found = 1;
                                break;

diff --git a/shell.c b/shell.c
index ace62e4b6503d821962242f9cf3bd9af22bc39b9..c5439a63e9678e1dc3dfa7d4e1f2a97c331e54d6 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -88,7 +88,7 @@ static void run_shell(void)
                int count;
 
                fprintf(stderr, "git> ");
                int count;
 
                fprintf(stderr, "git> ");

-               if (strbuf_getline(&line, stdin, '\n') == EOF) {
+               if (strbuf_getline_lf(&line, stdin) == EOF) {

                        fprintf(stderr, "\n");
                        strbuf_release(&line);
                        break;
                        fprintf(stderr, "\n");
                        strbuf_release(&line);
                        break;

diff --git a/strbuf.c b/strbuf.c
index 7ad5ea41459adff7e03eafdc4c4aa70996e28456..2ff898c8cc0c66fa3cac8d32d918c5ae3e40b24a 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -522,6 +522,16 @@ int strbuf_getline_crlf(struct strbuf *sb, FILE *fp)
        return 0;
 }
 
        return 0;
 }
 

+int strbuf_getline_lf(struct strbuf *sb, FILE *fp)
+{
+       return strbuf_getline(sb, fp, '\n');
+}
+
+int strbuf_getline_nul(struct strbuf *sb, FILE *fp)
+{
+       return strbuf_getline(sb, fp, '\0');
+}
+

 int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
 {
        strbuf_reset(sb);
 int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
 {
        strbuf_reset(sb);

diff --git a/strbuf.h b/strbuf.h
index d84c866ab1568ac9d85f3595c5eeab5b1b6be069..e56ec77e2b5367778f8a5e45bab98ef0b5646217 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -388,13 +388,25 @@ extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
  */
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
  */
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 

+/**
+ * The strbuf_getline*() family of functions share this signature, but
+ * have different line termination conventions.
+ */
+typedef int (*strbuf_getline_fn)(struct strbuf *, FILE *);
+
+/* Uses LF as the line terminator */
+extern int strbuf_getline_lf(struct strbuf *sb, FILE *fp);
+
+/* Uses NUL as the line terminator */
+extern int strbuf_getline_nul(struct strbuf *sb, FILE *fp);
+

 /*
 /*

- * Similar to strbuf_getline(), but uses '\n' as the terminator,
- * and additionally treats a '\r' that comes immediately before '\n'
- * as part of the terminator.
+ * Similar to strbuf_getline_lf(), but additionally treats a CR that
+ * comes immediately before the LF as part of the terminator.

  */
 extern int strbuf_getline_crlf(struct strbuf *, FILE *);
 
  */
 extern int strbuf_getline_crlf(struct strbuf *, FILE *);
 

+

 /**
  * Like `strbuf_getline`, but keeps the trailing terminator (if
  * any) in the buffer.
 /**
  * Like `strbuf_getline`, but keeps the trailing terminator (if
  * any) in the buffer.

diff --git a/test-sha1-array.c b/test-sha1-array.c
index ddc491eff9ca52c4aeeced77c901e5907d215f16..700f3f3422d9014bfc4853e1510e6e7ac8aa9b73 100644 (file)
--- a/test-sha1-array.c
+++ b/test-sha1-array.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
        struct sha1_array array = SHA1_ARRAY_INIT;
        struct strbuf line = STRBUF_INIT;
 
        struct sha1_array array = SHA1_ARRAY_INIT;
        struct strbuf line = STRBUF_INIT;
 

-       while (strbuf_getline(&line, stdin, '\n') != EOF) {
+       while (strbuf_getline_lf(&line, stdin) != EOF) {

                const char *arg;
                unsigned char sha1[20];
 
                const char *arg;
                unsigned char sha1[20];
 

diff --git a/transport-helper.c b/transport-helper.c
index 0eb3cf01aa1da857c7340805971e63305d73a6ea..163e4b1477ee23787ea23eb82379a1997db16e0d 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -54,7 +54,7 @@ static int recvline_fh(FILE *helper, struct strbuf *buffer, const char *name)
        strbuf_reset(buffer);
        if (debug)
                fprintf(stderr, "Debug: Remote helper: Waiting...\n");
        strbuf_reset(buffer);
        if (debug)
                fprintf(stderr, "Debug: Remote helper: Waiting...\n");

-       if (strbuf_getline(buffer, helper, '\n') == EOF) {
+       if (strbuf_getline_lf(buffer, helper) == EOF) {

                if (debug)
                        fprintf(stderr, "Debug: Remote helper quit.\n");
                return 1;
                if (debug)
                        fprintf(stderr, "Debug: Remote helper quit.\n");
                return 1;

diff --git a/walker.c b/walker.c
index 7b7e72b1201850f0ba494f8fc23a5c7f0e46d3eb..08773d419f17a131c35e8e671bcfe4b174a9ceb3 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -220,7 +220,7 @@ int walker_targets_stdin(char ***target, const char ***write_ref)
                char *rf_one = NULL;
                char *tg_one;
 
                char *rf_one = NULL;
                char *tg_one;
 

-               if (strbuf_getline(&buf, stdin, '\n') == EOF)
+               if (strbuf_getline_lf(&buf, stdin) == EOF)

                        break;
                tg_one = buf.buf;
                rf_one = strchr(tg_one, '\t');
                        break;
                tg_one = buf.buf;
                rf_one = strchr(tg_one, '\t');

diff --git a/wt-status.c b/wt-status.c
index bba25960b4e3c54a7c1d8861ea895fbe01aa3110..ab4f80d6d0415e449cade48e986c77c933bfecac 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -988,7 +988,7 @@ static char *read_line_from_git_path(const char *filename)
                strbuf_release(&buf);
                return NULL;
        }
                strbuf_release(&buf);
                return NULL;
        }

-       strbuf_getline(&buf, fp, '\n');
+       strbuf_getline_lf(&buf, fp);

        if (!fclose(fp)) {
                return strbuf_detach(&buf, NULL);
        } else {
        if (!fclose(fp)) {
                return strbuf_detach(&buf, NULL);
        } else {


@@ -1076,7 +1076,7 @@ static void read_rebase_todolist(const char *fname, struct string_list *lines)
        if (!f)
                die_errno("Could not open file %s for reading",
                          git_path("%s", fname));
        if (!f)
                die_errno("Could not open file %s for reading",
                          git_path("%s", fname));

-       while (!strbuf_getline(&line, f, '\n')) {
+       while (!strbuf_getline_lf(&line, f)) {

                if (line.len && line.buf[0] == comment_line_char)
                        continue;
                strbuf_trim(&line);
                if (line.len && line.buf[0] == comment_line_char)
                        continue;
                strbuf_trim(&line);