builtin-mailinfo,builtin-mailsplit: use strbufs

There should be no functional change.  Just the necessary changes and
simplifications associated with calling strbuf_getwholeline() rather
than an internal function or fgets.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 92637ac0bae82d0b88e267b572a51a75299cda5c..b0b5d8f6cb5107f3422d6107fd56f35ef62786f6 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -765,7 +765,6 @@ static void handle_filter(struct strbuf *line)
 
 static void handle_body(void)
 {
 
 static void handle_body(void)
 {

-       int len = 0;

        struct strbuf prev = STRBUF_INIT;
 
        /* Skip up to the first boundary */
        struct strbuf prev = STRBUF_INIT;
 
        /* Skip up to the first boundary */


@@ -775,8 +774,6 @@ static void handle_body(void)
        }
 
        do {
        }
 
        do {

-               strbuf_setlen(&line, line.len + len);
-

                /* process any boundary lines */
                if (*content_top && is_multipart_boundary(&line)) {
                        /* flush any leftover */
                /* process any boundary lines */
                if (*content_top && is_multipart_boundary(&line)) {
                        /* flush any leftover */


@@ -832,10 +829,7 @@ static void handle_body(void)
                        handle_filter(&line);
                }
 
                        handle_filter(&line);
                }
 

-               strbuf_reset(&line);
-               if (strbuf_avail(&line) < 100)
-                       strbuf_grow(&line, 100);
-       } while ((len = read_line_with_nul(line.buf, strbuf_avail(&line), fin)));
+       } while (!strbuf_getwholeline(&line, fin, '\n'));

 
 handle_body_out:
        strbuf_release(&prev);
 
 handle_body_out:
        strbuf_release(&prev);

diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index ad5f6b593df45f01360f3daa8b37d024ee793e9e..c2ec6ea3d51e760581dcb6f86c1783a545ebc07a 100644 (file)
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "builtin.h"
 #include "string-list.h"
 #include "cache.h"
 #include "builtin.h"
 #include "string-list.h"

+#include "strbuf.h"

 
 static const char git_mailsplit_usage[] =
 "git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
 
 static const char git_mailsplit_usage[] =
 "git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";


@@ -42,8 +43,7 @@ static int is_from_line(const char *line, int len)
        return 1;
 }
 
        return 1;
 }
 

-/* Could be as small as 64, enough to hold a Unix "From " line. */
-static char buf[4096];
+static struct strbuf buf = STRBUF_INIT;

 
 /* We cannot use fgets() because our lines can contain NULs */
 int read_line_with_nul(char *buf, int size, FILE *in)
 
 /* We cannot use fgets() because our lines can contain NULs */
 int read_line_with_nul(char *buf, int size, FILE *in)


@@ -71,10 +71,9 @@ int read_line_with_nul(char *buf, int size, FILE *in)
 static int split_one(FILE *mbox, const char *name, int allow_bare)
 {
        FILE *output = NULL;
 static int split_one(FILE *mbox, const char *name, int allow_bare)
 {
        FILE *output = NULL;

-       int len = strlen(buf);

        int fd;
        int status = 0;
        int fd;
        int status = 0;

-       int is_bare = !is_from_line(buf, len);
+       int is_bare = !is_from_line(buf.buf, buf.len);

 
        if (is_bare && !allow_bare)
                goto corrupt;
 
        if (is_bare && !allow_bare)
                goto corrupt;


@@ -88,20 +87,17 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
         * "From " and having something that looks like a date format.
         */
        for (;;) {
         * "From " and having something that looks like a date format.
         */
        for (;;) {

-               int is_partial = len && buf[len-1] != '\n';
-
-               if (fwrite(buf, 1, len, output) != len)
+               if (fwrite(buf.buf, 1, buf.len, output) != buf.len)

                        die_errno("cannot write output");
 
                        die_errno("cannot write output");
 

-               len = read_line_with_nul(buf, sizeof(buf), mbox);
-               if (len == 0) {
+               if (strbuf_getwholeline(&buf, mbox, '\n')) {

                        if (feof(mbox)) {
                                status = 1;
                                break;
                        }
                        die_errno("cannot read mbox");
                }
                        if (feof(mbox)) {
                                status = 1;
                                break;
                        }
                        die_errno("cannot read mbox");
                }

-               if (!is_partial && !is_bare && is_from_line(buf, len))
+               if (!is_bare && is_from_line(buf.buf, buf.len))

                        break; /* done with one message */
        }
        fclose(output);
                        break; /* done with one message */
        }
        fclose(output);


@@ -166,7 +162,7 @@ static int split_maildir(const char *maildir, const char *dir,
                        goto out;
                }
 
                        goto out;
                }
 

-               if (fgets(buf, sizeof(buf), f) == NULL) {
+               if (strbuf_getwholeline(&buf, f, '\n')) {

                        error("cannot read mail %s (%s)", file, strerror(errno));
                        goto out;
                }
                        error("cannot read mail %s (%s)", file, strerror(errno));
                        goto out;
                }


@@ -203,7 +199,7 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
        } while (isspace(peek));
        ungetc(peek, f);
 
        } while (isspace(peek));
        ungetc(peek, f);
 

-       if (fgets(buf, sizeof(buf), f) == NULL) {
+       if (strbuf_getwholeline(&buf, f, '\n')) {

                /* empty stdin is OK */
                if (f != stdin) {
                        error("cannot read mbox %s", file);
                /* empty stdin is OK */
                if (f != stdin) {
                        error("cannot read mbox %s", file);