File yaps-0.96-getline.diff of Package capi4yaps

Index: cfg.c
===================================================================
--- cfg.c.orig
+++ 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 = my_getline (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 = my_getline (fcur -> fp, False)) {
 									if ((*ptr != '}') || *(ptr + 1)) {
 										plen = strlen (ptr);
 										if (len + plen + 2 >= siz) {
Index: cv.c
===================================================================
--- cv.c.orig
+++ 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 = my_getline (fp, True)) {
 		for (sp = line; isspace (*sp); ++sp)
 			;
 		if (*sp && (*sp != '#')) {
Index: pager.h
===================================================================
--- pager.h.orig
+++ 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	*my_getline (FILE *fp, Bool cont);
 extern int	verbose_out (char *, ...);
 /*}}}*/
 /*{{{	string handling */
Index: util.c
===================================================================
--- util.c.orig
+++ util.c
@@ -36,7 +36,7 @@ skipch (char *str, char ch)
 }
 
 char *
-getline (FILE *fp, Bool cont)
+my_getline (FILE *fp, Bool cont)
 {
 	char	*buf;
 	int	size;
Index: yaps.c
===================================================================
--- yaps.c.orig
+++ 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 = my_getline (fp, False)) {
 			sav = skip (ptr);
 			if (*ptr && *sav) {
 				if (rcnt + 2 >= rsiz) {