Explicitly check for '\0' at the start and exit early

This commit is contained in:
sin 2014-02-04 14:36:58 +00:00
parent c2db1b9ec6
commit ed9985205b
1 changed files with 3 additions and 4 deletions

View File

@ -95,12 +95,11 @@ checkheader(FILE *fp, const char *s, const char *header, mode_t *mode, char **fn
char *p, *q;
size_t n;
if (fgets(bufs, sizeof(bufs), fp) == NULL) {
if (fgets(bufs, sizeof(bufs), fp) == NULL)
if (ferror(fp))
eprintf("%s: read error:", s);
else
eprintf("empty or null header string\n");
}
if (bufs[0] == '\0' || feof(fp))
eprintf("empty or nil header string\n");
if ((p = strchr(bufs, '\n')) == NULL)
eprintf("header string too long or non-newline terminated file\n");
p = bufs;