d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly handle an input file without a newline on the last line (and

Browse Source 
avoid the confusing error message about the line being too long). This
change uses fgetln to detect the right conditions, but the fixed-width
line buffer is kept because too many other places in the program make
assumptions about its maximum width.

Approved by:	re (scottl)
This commit is contained in:
Dima Dorfman 2005-06-15 10:13:04 +00:00
parent b61403ff72
commit ff900deda6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/pwd_mkdb/pwd_mkdb.c
View File

@ -631,12 +631,14 @@ main(int argc, char *argv[])
}
int
scan(FILE * fp, struct passwd *pw)
scan(FILE *fp, struct passwd *pw)
{
static int lcnt;
size_t len;
char *p;
if (!fgets(line, sizeof(line), fp))
p = fgetln(fp, &len);
if (p == NULL)
return (0);
++lcnt;
/*
@ -644,16 +646,14 @@ scan(FILE * fp, struct passwd *pw)
* throat...''
* -- The Who
*/
if (!(p = strchr(line, '\n'))) {
/*
* XXX: This may also happen if the last line in a
* file does not have a trailing newline.
*/
if (len > 0 && p[len - 1] == '\n')
len--;
if (len >= sizeof(line) - 1) {
warnx("line #%d too long", lcnt);
goto fmt;
}
*p = '\0';
memcpy(line, p, len);
line[len] = '\0';
/*
* Ignore comments: ^[ \t]*#