Merge branch 'maint'

[git.git] / builtin-mailsplit.c

diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index e4d977bafbc04fa2bfedfc2912fc87bed9de8e1e..e8cbe678ecdc0863ebe92e6499dd2b1eacf77db6 100644 (file)
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -9,7 +9,7 @@
 #include "path-list.h"
 
 static const char git_mailsplit_usage[] =
-"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> <mbox>|<Maildir>...";
+"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
 
 static int is_from_line(const char *line, int len)
 {
@@ -52,13 +52,12 @@ int read_line_with_nul(char *buf, int size, FILE *in)
 
        for (;;) {
                c = getc(in);
+               if (c == EOF)
+                       break;
                buf[len++] = c;
-               if (c == EOF || c == '\n' || len + 1 >= size)
+               if (c == '\n' || len + 1 >= size)
                        break;
        }
-
-       if (c == EOF)
-               len--;
        buf[len] = '\0';
 
        return len;