From owner-svn-ports-all@freebsd.org Fri Jul 29 23:45:48 2016 Return-Path: Delivered-To: svn-ports-all@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 9A21ABA7D2A; Fri, 29 Jul 2016 23:45:48 +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 329FC15F1; Fri, 29 Jul 2016 23:45:48 +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 u6TNjlEp030294; Fri, 29 Jul 2016 23:45:47 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6TNjlGF030291; Fri, 29 Jul 2016 23:45:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201607292345.u6TNjlGF030291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 29 Jul 2016 23:45:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419284 - head/print/magicfilter/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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jul 2016 23:45:48 -0000 Author: bapt Date: Fri Jul 29 23:45:46 2016 New Revision: 419284 URL: https://svnweb.freebsd.org/changeset/ports/419284 Log: Prevent collision with getline(3) Added: head/print/magicfilter/files/patch-fe.c (contents, props changed) head/print/magicfilter/files/patch-rule.h (contents, props changed) Modified: head/print/magicfilter/files/patch-getline.c Added: head/print/magicfilter/files/patch-fe.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/magicfilter/files/patch-fe.c Fri Jul 29 23:45:46 2016 (r419284) @@ -0,0 +1,11 @@ +--- fe.c.orig 2003-05-09 18:27:15 UTC ++++ fe.c +@@ -128,7 +128,7 @@ be(int input, int output) + + /* read rules + */ +- while ( (r = getline(f)) != 0) { ++ while ( (r = get_line(f)) != 0) { + rulecount++; + if (tail) { + tail->next = r; Modified: head/print/magicfilter/files/patch-getline.c ============================================================================== --- head/print/magicfilter/files/patch-getline.c Fri Jul 29 23:45:41 2016 (r419283) +++ head/print/magicfilter/files/patch-getline.c Fri Jul 29 23:45:46 2016 (r419284) @@ -1,6 +1,5 @@ -diff -ur/getline.c getline.c ---- getline.c Sun Dec 5 01:32:50 2004 -+++ getline.c Sun Dec 5 01:33:11 2004 +--- getline.c.orig 2002-12-14 09:02:26 UTC ++++ getline.c @@ -34,7 +34,7 @@ * /pattern/ action[/hint/] [arg {arg ...}] */ @@ -10,3 +9,12 @@ diff -ur/getline.c getline.c #include #include #include "rule.h" +@@ -175,7 +175,7 @@ vis(FILE *output, unsigned char *s) + * getline() gets a rule off the input stream + */ + struct rule * +-getline(FILE *input) ++get_line(FILE *input) + { + static char *bfr = 0; /* a buffer for reading lines into */ + static int buflen = 0; /* size of that buffer */ Added: head/print/magicfilter/files/patch-rule.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/magicfilter/files/patch-rule.h Fri Jul 29 23:45:46 2016 (r419284) @@ -0,0 +1,11 @@ +--- rule.h.orig 2002-07-11 23:23:43 UTC ++++ rule.h +@@ -55,7 +55,7 @@ struct rule { + struct rule *next; /* next rule in the chain */ + } ; + +-extern struct rule *getline(FILE *); ++extern struct rule *get_line(FILE *); + extern struct rule *rules; + char * action_p(enum rule_action); +