svn commit: r419284 - head/print/magicfilter/files
Baptiste Daroussin
bapt at FreeBSD.org
Fri Jul 29 23:45:48 UTC 2016
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 <string.h>
#include <ctype.h>
#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);
+
More information about the svn-ports-all
mailing list