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

Replace fparseln(3) with getline(3) to remove dependency on libutil

Browse Source
This commit is contained in:
Baptiste Daroussin 2016-05-09 20:04:22 +00:00
parent d3cd2df1f2
commit 8c98e6b1a7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/services_mkdb/Makefile
View File

@ -4,6 +4,4 @@ PROG= services_mkdb
MAN= services_mkdb.8
SRCS= services_mkdb.c uniq.c extern.h
LIBADD= util
.include <bsd.prog.mk>

16
usr.sbin/services_mkdb/services_mkdb.c
View File

@ -40,12 +40,12 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <fcntl.h>
#include <netdb.h>
#define _WITH_GETLINE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <libgen.h>
#include <libutil.h>
#include <ctype.h>
#include <errno.h>
#include <stringlist.h>
@ -235,7 +235,8 @@ add(DB *db, StringList *sl, size_t port, const char *proto, size_t *cnt,
static StringList ***
parseservices(const char *fname, StringList *sl)
{
size_t len, line, pindex;
ssize_t len;
size_t linecap, line, pindex;
FILE *fp;
StringList ***svc, *s;
char *p, *ep;
@ -243,18 +244,23 @@ parseservices(const char *fname, StringList *sl)
if ((fp = fopen(fname, "r")) == NULL)
err(1, "Cannot open `%s'", fname);
line = 0;
line = linecap = 0;
if ((svc = calloc(PMASK + 1, sizeof(StringList **))) == NULL)
err(1, "Cannot allocate %zu bytes", (size_t)(PMASK + 1));
/* XXX: change NULL to "\0\0#" when fparseln fixed */
for (; (p = fparseln(fp, &len, &line, NULL, 0)) != NULL; free(p)) {
p = NULL;
while ((len = getline(&p, &linecap, fp)) != -1) {
char *name, *port, *proto, *aliases, *cp, *alias;
unsigned long pnum;
line++;
if (len == 0)
continue;
if (p[len - 1] == '\n')
p[len - 1] = '\0';
for (cp = p; *cp && isspace((unsigned char)*cp); cp++)
continue;