From owner-svn-src-head@freebsd.org  Mon May  9 20:04:23 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AE3AB340A4;
 Mon,  9 May 2016 20:04:23 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 34C311386;
 Mon,  9 May 2016 20:04:23 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u49K4MVL006980;
 Mon, 9 May 2016 20:04:22 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u49K4MGj006978;
 Mon, 9 May 2016 20:04:22 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605092004.u49K4MGj006978@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 May 2016 20:04:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299284 - head/usr.sbin/services_mkdb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2016 20:04:23 -0000

Author: bapt
Date: Mon May  9 20:04:22 2016
New Revision: 299284
URL: https://svnweb.freebsd.org/changeset/base/299284

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

Modified:
  head/usr.sbin/services_mkdb/Makefile
  head/usr.sbin/services_mkdb/services_mkdb.c

Modified: head/usr.sbin/services_mkdb/Makefile
==============================================================================
--- head/usr.sbin/services_mkdb/Makefile	Mon May  9 20:01:34 2016	(r299283)
+++ head/usr.sbin/services_mkdb/Makefile	Mon May  9 20:04:22 2016	(r299284)
@@ -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>

Modified: head/usr.sbin/services_mkdb/services_mkdb.c
==============================================================================
--- head/usr.sbin/services_mkdb/services_mkdb.c	Mon May  9 20:01:34 2016	(r299283)
+++ head/usr.sbin/services_mkdb/services_mkdb.c	Mon May  9 20:04:22 2016	(r299284)
@@ -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,
 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, StringL
 	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;