Skip to content

Commit 33309e4

Browse files
committed
Merge branch 'ab/imap-send-read-everything-simplify'
Code simplification. * ab/imap-send-read-everything-simplify: imap-send.c: use less verbose strbuf_fread() idiom
2 parents bb3a55f + 351bca2 commit 33309e4

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

imap-send.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,18 +1266,6 @@ static void wrap_in_html(struct strbuf *msg)
12661266
*msg = buf;
12671267
}
12681268

1269-
#define CHUNKSIZE 0x1000
1270-
1271-
static int read_message(FILE *f, struct strbuf *all_msgs)
1272-
{
1273-
do {
1274-
if (strbuf_fread(all_msgs, CHUNKSIZE, f) <= 0)
1275-
break;
1276-
} while (!feof(f));
1277-
1278-
return ferror(f) ? -1 : 0;
1279-
}
1280-
12811269
static int count_messages(struct strbuf *all_msgs)
12821270
{
12831271
int count = 0;
@@ -1582,8 +1570,8 @@ int cmd_main(int argc, const char **argv)
15821570
}
15831571

15841572
/* read the messages */
1585-
if (read_message(stdin, &all_msgs)) {
1586-
fprintf(stderr, "error reading input\n");
1573+
if (strbuf_read(&all_msgs, 0, 0) < 0) {
1574+
error_errno(_("could not read from stdin"));
15871575
return 1;
15881576
}
15891577

0 commit comments

Comments
 (0)