Prevent collision on getline(3)

While here regen patches

4 files changed, 49 insertions, 13 deletions

diff --git a/math/physcalc/files/patch-physcalc.h b/math/physcalc/files/patch-physcalc.h
index 96b25217a20d..05ba40466f59 100644
--- a/math/physcalc/files/patch-physcalc.h
+++ b/math/physcalc/files/patch-physcalc.h
@@ -1,5 +1,5 @@
---- physcalc.h	Sun Aug 27 17:46:31 2000
-+++ physcalc.h.new	Sun Aug 27 17:46:57 2000
+--- physcalc.h.orig	1998-08-29 14:13:40 UTC
++++ physcalc.h
 @@ -22,6 +22,10 @@
  #error This program requires more memory than the tiny model allows!
  #endif
diff --git a/math/physcalc/files/patch-physconv.c b/math/physcalc/files/patch-physconv.c
index 179a6a6b4eac..40e475670ce3 100644
--- a/math/physcalc/files/patch-physconv.c
+++ b/math/physcalc/files/patch-physconv.c
@@ -1,6 +1,24 @@
---- physconv.c.orig	1998-08-30 15:58:16.000000000 -0500
-+++ physconv.c	2009-06-25 22:22:21.000000000 -0500
-@@ -260,12 +260,16 @@
+--- physconv.c.orig	1998-08-30 13:58:16 UTC
++++ physconv.c
+@@ -32,7 +32,7 @@
+ #include "physdecl.h"
+ 
+ #ifdef __PROTOTYPES__
+-LOCAL void getline(FILE *fp, char *buf);
++LOCAL void get_line(FILE *fp, char *buf);
+ LOCAL int evalxpon(char *s);
+ LOCAL void fixplural(char *s);
+ LOCAL int output_dims(FILE *fp, int const d[MAXDIM]);
+@@ -86,7 +86,7 @@ EXPORT struct dimstruct *dimension_list=
+ 
+ /*-----Functions-----*/
+ 
+-LOCAL void getline(fp,buf)	/* Get a line from the file & doctor it up */
++LOCAL void get_line(fp,buf)	/* Get a line from the file & doctor it up */
+ FILE *fp;
+ char *buf;
+ {
+@@ -260,12 +260,16 @@ char const *s;
  {	/* read in lines from fp and do each as if typed from console */
  	FILE *fp;
  	char buf[SMALLBUF];
@@ -18,7 +36,16 @@
  		printf("Can't open %s\n",s);
  		return;
  	}
-@@ -797,7 +801,7 @@
+@@ -276,7 +280,7 @@ char const *s;
+ #endif
+ 	echo = FALSE;
+ 	while (TRUE) {
+-		getline(fp,buf);
++		get_line(fp,buf);
+ 		if (!buf[0])
+ 			break;
+ 		do_cmd(buf);
+@@ -797,7 +801,7 @@ char const *s;
  				} else {
  					showdims(&d);
  					printf("Convert to: ");
diff --git a/math/physcalc/files/patch-physmain.c b/math/physcalc/files/patch-physmain.c
index c76d57866f58..65df3be4132f 100644
--- a/math/physcalc/files/patch-physmain.c
+++ b/math/physcalc/files/patch-physmain.c
@@ -1,6 +1,6 @@
---- physmain.c.orig	1998-08-30 14:48:34.000000000 -0500
-+++ physmain.c	2009-06-25 22:32:46.000000000 -0500
-@@ -227,7 +227,7 @@
+--- physmain.c.orig	1998-08-30 12:48:34 UTC
++++ physmain.c
+@@ -227,7 +227,7 @@ char const *s;
  				printf("Replace %s = ",v->name);
  				printexpr(v->value);
  				printf(" ?");
@@ -9,7 +9,16 @@
  				printf("\n");
  			} else
  				answer[0] = 'Y';
-@@ -711,7 +711,8 @@
+@@ -656,7 +656,7 @@ void LegalCrap()
+ 
+ }
+ 
+-void main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[];
+ {	/* Main program: Init vars, load unit & help data, enter main loop */
+@@ -711,7 +711,8 @@ char *argv[];
  	} else
  		while (TRUE) {
  			printf(">");
diff --git a/math/physcalc/files/patch-physnode.c b/math/physcalc/files/patch-physnode.c
index 0e2ca9307898..3d4cf27dd5fe 100644
--- a/math/physcalc/files/patch-physnode.c
+++ b/math/physcalc/files/patch-physnode.c
@@ -1,6 +1,6 @@
---- physnode.c.orig	Sat Oct  7 21:33:27 2006
-+++ physnode.c	Sat Oct  7 21:33:30 2006
-@@ -305,12 +305,12 @@
+--- physnode.c.orig	1998-08-29 14:17:12 UTC
++++ physnode.c
+@@ -305,12 +305,12 @@ NODEP n;
  }
  
  EXPORT void bytecopy(dst, src, bytes)