From owner-svn-src-head@freebsd.org Thu Dec 14 08:57:38 2017 Return-Path: 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 7EC19E9CCD4; Thu, 14 Dec 2017 08:57:38 +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 5406F7B260; Thu, 14 Dec 2017 08:57:38 +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 vBE8vbfM069667; Thu, 14 Dec 2017 08:57:37 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBE8vbEY069664; Thu, 14 Dec 2017 08:57:37 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201712140857.vBE8vbEY069664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 14 Dec 2017 08:57:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326844 - head/usr.sbin/mailwrapper X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/usr.sbin/mailwrapper X-SVN-Commit-Revision: 326844 X-SVN-Commit-Repository: base 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.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Dec 2017 08:57:38 -0000 Author: bapt Date: Thu Dec 14 08:57:37 2017 New Revision: 326844 URL: https://svnweb.freebsd.org/changeset/base/326844 Log: Replace usage of fparselen(3) by a getline(3) This allow to remove the dependency on libutil Modified: head/usr.sbin/mailwrapper/Makefile head/usr.sbin/mailwrapper/Makefile.depend head/usr.sbin/mailwrapper/mailwrapper.c Modified: head/usr.sbin/mailwrapper/Makefile ============================================================================== --- head/usr.sbin/mailwrapper/Makefile Thu Dec 14 07:55:11 2017 (r326843) +++ head/usr.sbin/mailwrapper/Makefile Thu Dec 14 08:57:37 2017 (r326844) @@ -5,8 +5,6 @@ .if ${MK_MAILWRAPPER} != "no" PROG= mailwrapper MAN= mailwrapper.8 - -LIBADD= util .endif .if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" Modified: head/usr.sbin/mailwrapper/Makefile.depend ============================================================================== --- head/usr.sbin/mailwrapper/Makefile.depend Thu Dec 14 07:55:11 2017 (r326843) +++ head/usr.sbin/mailwrapper/Makefile.depend Thu Dec 14 08:57:37 2017 (r326844) @@ -7,8 +7,7 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libcompiler_rt \ - lib/libutil \ + lib/libcompiler_rt .include Modified: head/usr.sbin/mailwrapper/mailwrapper.c ============================================================================== --- head/usr.sbin/mailwrapper/mailwrapper.c Thu Dec 14 07:55:11 2017 (r326843) +++ head/usr.sbin/mailwrapper/mailwrapper.c Thu Dec 14 08:57:37 2017 (r326844) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -89,14 +88,17 @@ int main(int argc, char *argv[], char *envp[]) { FILE *config; - char *line, *cp, *from, *to, *ap; + char *line, *cp, *from, *to, *ap, *walk; const char *progname; char localmailerconf[MAXPATHLEN]; const char *mailerconf; - size_t len, lineno = 0; + size_t linecap = 0, lineno = 0; + ssize_t linelen; int i; struct arglist al; + line = NULL; + /* change __progname to mailwrapper so we get sensible error messages */ progname = getprogname(); setprogname("mailwrapper"); @@ -123,12 +125,16 @@ main(int argc, char *argv[], char *envp[]) } for (;;) { - if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) { - if (feof(config)) + if ((linelen = getline(&line, &linecap, config)) <= 0) { + if (feof(config)) { errx(EX_CONFIG, "no mapping in %s", mailerconf); + } err(EX_CONFIG, "cannot parse line %lu", (u_long)lineno); } - + lineno++; + walk = line; + /* strip comments */ + strsep(&walk, "#"); #define WS " \t\n" cp = line;