From de43b1e9363a8ec454566e6f4b4e28076288fafa Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 1 Aug 2016 06:13:41 +0000
Subject: Fix collision with getline(3)

---
 comms/yaps/files/patch-cfg.c   | 20 ++++++++++++++++++++
 comms/yaps/files/patch-cv.c    | 11 +++++++++++
 comms/yaps/files/patch-pager.h | 11 +++++++++++
 comms/yaps/files/patch-util.c  | 11 +++++++++++
 comms/yaps/files/patch-yaps.c  | 11 +++++++++++
 5 files changed, 64 insertions(+)
 create mode 100644 comms/yaps/files/patch-cfg.c
 create mode 100644 comms/yaps/files/patch-cv.c
 create mode 100644 comms/yaps/files/patch-pager.h
 create mode 100644 comms/yaps/files/patch-util.c
 create mode 100644 comms/yaps/files/patch-yaps.c

(limited to 'comms/yaps')

diff --git a/comms/yaps/files/patch-cfg.c b/comms/yaps/files/patch-cfg.c
new file mode 100644
index 000000000000..e6750f3d31a8
--- /dev/null
+++ b/comms/yaps/files/patch-cfg.c
@@ -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) {
diff --git a/comms/yaps/files/patch-cv.c b/comms/yaps/files/patch-cv.c
new file mode 100644
index 000000000000..22aa4b7a311d
--- /dev/null
+++ b/comms/yaps/files/patch-cv.c
@@ -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 != '#')) {
diff --git a/comms/yaps/files/patch-pager.h b/comms/yaps/files/patch-pager.h
new file mode 100644
index 000000000000..41dcd8df3ed8
--- /dev/null
+++ b/comms/yaps/files/patch-pager.h
@@ -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 */
diff --git a/comms/yaps/files/patch-util.c b/comms/yaps/files/patch-util.c
new file mode 100644
index 000000000000..b3056b77c963
--- /dev/null
+++ b/comms/yaps/files/patch-util.c
@@ -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;
diff --git a/comms/yaps/files/patch-yaps.c b/comms/yaps/files/patch-yaps.c
new file mode 100644
index 000000000000..b672b58c3b19
--- /dev/null
+++ b/comms/yaps/files/patch-yaps.c
@@ -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) {
-- 
cgit v1.2.3