strbuf: add new function strbuf_getwholeline()

This function is just like strbuf_getline() except it retains the
line-termination character.  This function will be used by the mailinfo
and mailsplit builtins which require the entire line for parsing.

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

diff --git a/strbuf.c b/strbuf.c
index f03d11702b3f6212ca7305df60f2f9ea6ca49e35..a6153dca278abe957254fa091fdcd8eb13b90b25 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -322,7 +322,7 @@ int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
        return -1;
 }
 
        return -1;
 }
 

-int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
+int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term)

 {
        int ch;
 
 {
        int ch;
 


@@ -332,10 +332,10 @@ int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
 
        strbuf_reset(sb);
        while ((ch = fgetc(fp)) != EOF) {
 
        strbuf_reset(sb);
        while ((ch = fgetc(fp)) != EOF) {

-               if (ch == term)
-                       break;

                strbuf_grow(sb, 1);
                sb->buf[sb->len++] = ch;
                strbuf_grow(sb, 1);
                sb->buf[sb->len++] = ch;

+               if (ch == term)
+                       break;

        }
        if (ch == EOF && sb->len == 0)
                return EOF;
        }
        if (ch == EOF && sb->len == 0)
                return EOF;


@@ -344,6 +344,15 @@ int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
        return 0;
 }
 
        return 0;
 }
 

+int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
+{
+       if (strbuf_getwholeline(sb, fp, term))
+               return EOF;
+       if (sb->buf[sb->len-1] == term)
+               strbuf_setlen(sb, sb->len-1);
+       return 0;
+}
+

 int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
 {
        int fd, len;
 int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
 {
        int fd, len;

diff --git a/strbuf.h b/strbuf.h
index eaa8704d5fa6e85d33953db77dd03de3cb462df4..d05e056dd3916b64865ac9a0337ecbf31625f436 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -126,6 +126,7 @@ extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
 extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
 extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
 
 extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
 extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
 

+extern int strbuf_getwholeline(struct strbuf *, FILE *, int);

 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
 extern void stripspace(struct strbuf *buf, int skip_comments);
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
 extern void stripspace(struct strbuf *buf, int skip_comments);