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

Simplify reading pw.conf(5) by using getline(3)

Browse Source
This commit is contained in:
Baptiste Daroussin 2014-04-22 21:07:56 +00:00
parent 79aae9e1c2
commit c145c34c09
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=264781
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/pw/pw.h
View File

@ -26,6 +26,7 @@
* $FreeBSD$
*/
#define _WITH_GETLINE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

35
usr.sbin/pw/pw_conf.c
View File

@ -226,35 +226,21 @@ newstr(char const * p)
struct userconf *
read_userconfig(char const * file)
{
FILE *fp;
FILE *fp;
char *buf, *p;
size_t linecap;
ssize_t linelen;
buf = NULL;
linecap = 0;
extendarray(&config.groups, &config.numgroups, 200);
memset(config.groups, 0, config.numgroups * sizeof(char *));
if (file == NULL)
file = _PATH_PW_CONF;
if ((fp = fopen(file, "r")) != NULL) {
int buflen = LNBUFSZ;
char *buf = malloc(buflen);
nextline:
while (fgets(buf, buflen, fp) != NULL) {
char *p;
while ((p = strchr(buf, '\n')) == NULL) {
int l;
if (extendline(&buf, &buflen, buflen + LNBUFSZ) == -1) {
int ch;
while ((ch = fgetc(fp)) != '\n' && ch != EOF);
goto nextline; /* Ignore it */
}
l = strlen(buf);
if (fgets(buf + l, buflen - l, fp) == NULL)
break; /* Unterminated last line */
}
if (p != NULL)
*p = '\0';
while ((linelen = getline(&buf, &linecap, fp)) > 0) {
if (*buf && (p = strtok(buf, " \t\r\n=")) != NULL && *p != '#') {
static char const toks[] = " \t\r\n,=";
char *q = strtok(NULL, toks);
@ -368,7 +354,8 @@ read_userconfig(char const * file)
}
}
}
free(buf);
if (linecap > 0)
free(buf);
fclose(fp);
}
return &config;