From owner-svn-ports-head@freebsd.org Mon Aug 1 06:13:42 2016 Return-Path: Delivered-To: svn-ports-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 C596BBACD83; Mon, 1 Aug 2016 06:13:42 +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 A399614E7; Mon, 1 Aug 2016 06:13:42 +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 u716DfDe051697; Mon, 1 Aug 2016 06:13:41 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u716DfCN051692; Mon, 1 Aug 2016 06:13:41 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201608010613.u716DfCN051692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 1 Aug 2016 06:13:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419426 - head/comms/yaps/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 06:13:42 -0000 Author: bapt Date: Mon Aug 1 06:13:41 2016 New Revision: 419426 URL: https://svnweb.freebsd.org/changeset/ports/419426 Log: Fix collision with getline(3) Added: head/comms/yaps/files/patch-cfg.c (contents, props changed) head/comms/yaps/files/patch-cv.c (contents, props changed) head/comms/yaps/files/patch-pager.h (contents, props changed) head/comms/yaps/files/patch-util.c (contents, props changed) head/comms/yaps/files/patch-yaps.c (contents, props changed) Added: head/comms/yaps/files/patch-cfg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/yaps/files/patch-cfg.c Mon Aug 1 06:13:41 2016 (r419426) @@ -0,0 +1,20 @@ +--- cfg.c.orig 1997-06-11 12:05:34 UTC ++++ cfg.c +@@ -203,7 +203,7 @@ cfg_read (char *fname, void *bp, char *s + fcur -> fp = fp; + fcur -> up = NULL; + while (fcur) { +- while (gline = getline (fcur -> fp, True)) { ++ while (gline = get_line (fcur -> fp, True)) { + for (line = gline; isspace (*line); ++line) + ; + if ((! *line) || (*line == '#')) { +@@ -279,7 +279,7 @@ cfg_read (char *fname, void *bp, char *s + done = False; + siz = 0; + len = 0; +- while (ptr = getline (fcur -> fp, False)) { ++ while (ptr = get_line (fcur -> fp, False)) { + if ((*ptr != '}') || *(ptr + 1)) { + plen = strlen (ptr); + if (len + plen + 2 >= siz) { Added: head/comms/yaps/files/patch-cv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/yaps/files/patch-cv.c Mon Aug 1 06:13:41 2016 (r419426) @@ -0,0 +1,11 @@ +--- cv.c.orig 1997-06-03 18:43:52 UTC ++++ cv.c +@@ -151,7 +151,7 @@ cv_read_table (void *cv, char *fname) + MCHK (c); + if ((! c) || (! (fp = fopen (fname, "r")))) + return -1; +- while (line = getline (fp, True)) { ++ while (line = get_line (fp, True)) { + for (sp = line; isspace (*sp); ++sp) + ; + if (*sp && (*sp != '#')) { Added: head/comms/yaps/files/patch-pager.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/yaps/files/patch-pager.h Mon Aug 1 06:13:41 2016 (r419426) @@ -0,0 +1,11 @@ +--- pager.h.orig 1997-06-12 11:59:28 UTC ++++ pager.h +@@ -67,7 +67,7 @@ typedef struct { + /*{{{ utility */ + extern char *skip (char *str); + extern char *skipch (char *str, char ch); +-extern char *getline (FILE *fp, Bool cont); ++extern char *get_line (FILE *fp, Bool cont); + extern int verbose_out (char *, ...); + /*}}}*/ + /*{{{ string handling */ Added: head/comms/yaps/files/patch-util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/yaps/files/patch-util.c Mon Aug 1 06:13:41 2016 (r419426) @@ -0,0 +1,11 @@ +--- util.c.orig 1997-05-31 17:20:40 UTC ++++ util.c +@@ -36,7 +36,7 @@ skipch (char *str, char ch) + } + + char * +-getline (FILE *fp, Bool cont) ++get_line (FILE *fp, Bool cont) + { + char *buf; + int size; Added: head/comms/yaps/files/patch-yaps.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/yaps/files/patch-yaps.c Mon Aug 1 06:13:41 2016 (r419426) @@ -0,0 +1,11 @@ +--- yaps.c.orig 1997-06-14 10:25:56 UTC ++++ yaps.c +@@ -1177,7 +1177,7 @@ create_messages (void *cfg, char *servic + fprintf (stderr, "Unable to open message file %s for reading\n", mfile); + return NULL; + } +- while (ptr = getline (fp, False)) { ++ while (ptr = get_line (fp, False)) { + sav = skip (ptr); + if (*ptr && *sav) { + if (rcnt + 2 >= rsiz) {