mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/mailsplit-dead-code-removal'

Browse Source 
* sb/mailsplit-dead-code-removal:
  mailsplit.c: remove dead code
This commit is contained in:
Junio C Hamano
2014-09-09 12:54:04 -07:00
parent 067f86fe12 13b081257a
commit 08668f1802
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/mailsplit.c
View File

@ -53,14 +53,16 @@ static int keep_cr;
*/ */
static int split_one(FILE *mbox, const char *name, int allow_bare) static int split_one(FILE *mbox, const char *name, int allow_bare)
{ {
FILE *output = NULL; FILE *output;
int fd; int fd;
int status = 0; int status = 0;
int is_bare = !is_from_line(buf.buf, buf.len); int is_bare = !is_from_line(buf.buf, buf.len);
if (is_bare && !allow_bare) if (is_bare && !allow_bare) {
goto corrupt; unlink(name);
fprintf(stderr, "corrupt mailbox\n");
exit(1);
}
fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666); fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (fd < 0) if (fd < 0)
die_errno("cannot open output file '%s'", name); die_errno("cannot open output file '%s'", name);
@ -91,13 +93,6 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
} }
fclose(output); fclose(output);
return status; return status;
corrupt:
if (output)
fclose(output);
unlink(name);
fprintf(stderr, "corrupt mailbox\n");
exit(1);
} }
static int populate_maildir_list(struct string_list *list, const char *path) static int populate_maildir_list(struct string_list *list, const char *path)