Fix build on -current (remove conflicting prototype for strsave() and

include correct headers)

3 files changed, 68 insertions, 72 deletions

diff --git a/misc/mshell/files/patch-ad b/misc/mshell/files/patch-ad
index de74911fbf3..35815355ded 100644
--- a/misc/mshell/files/patch-ad
+++ b/misc/mshell/files/patch-ad
@@ -1,72 +1,47 @@
-*** mshell.c.orig	Sun Sep 19 11:00:53 1999
---- mshell.c	Sun Sep 19 11:09:05 1999
-***************
-*** 26,33 ****
-  	     exec_string   [DESCLEN],
-  	     *args         [MAXARGS],
-  	     *menu_array   [LINES],
-! 	     tmpword       [WORDLEN],
-! 	     *malloc();
-  
-  	int  i, 
-  	     idx,
---- 26,32 ----
-  	     exec_string   [DESCLEN],
-  	     *args         [MAXARGS],
-  	     *menu_array   [LINES],
-! 	     tmpword       [WORDLEN];
-  
-  	int  i, 
-  	     idx,
-***************
-*** 35,42 ****
-  	     firsttime = TRUE,
-  	     dontdisplay = FALSE,
-  	     unix_flag,
-! 	     menu_flag,
-! 	     exit();
-  
-  	static jmp_buf topenv;
-  	static int topenvset;
---- 34,40 ----
-  	     firsttime = TRUE,
-  	     dontdisplay = FALSE,
-  	     unix_flag,
-! 	     menu_flag;
-  
-  	static jmp_buf topenv;
-  	static int topenvset;
-***************
-*** 49,55 ****
-  	signal (SIGPIPE, SIG_IGN);	/* ignore dead pipes */
-  	log("enter", m);
-  
-! 	while TRUE {
-  
-  		if (!topenvset) {
-  			topenvset = TRUE;
---- 47,53 ----
-  	signal (SIGPIPE, SIG_IGN);	/* ignore dead pipes */
-  	log("enter", m);
-  
-! 	while (TRUE) {
-  
-  		if (!topenvset) {
-  			topenvset = TRUE;
-***************
-*** 142,148 ****
-  
-  			if ( strcmp (action_string, NULLSTR) == 0 ) {
-  				invalid_option = TRUE;
-! 				printf ("\tNo such help option name as: %s\!\!\n", opt2);
-  			}
-  			else {
-  				tmpword[0] = EOS;
---- 140,146 ----
-  
-  			if ( strcmp (action_string, NULLSTR) == 0 ) {
-  				invalid_option = TRUE;
-! 				printf ("\tNo such help option name as: %s!!\n", opt2);
-  			}
-  			else {
-  				tmpword[0] = EOS;
+--- mshell.c.orig	Sun Oct 20 16:13:17 2002
++++ mshell.c	Sun Oct 20 16:13:45 2002
+@@ -1,5 +1,6 @@
+ #include "mshell.h"
+ #include <setjmp.h>
++#include <stdlib.h>
+ char * index ();
+ 
+ 
+@@ -26,8 +27,7 @@
+ 	     exec_string   [DESCLEN],
+ 	     *args         [MAXARGS],
+ 	     *menu_array   [LINES],
+-	     tmpword       [WORDLEN],
+-	     *malloc();
++	     tmpword       [WORDLEN];
+ 
+ 	int  i, 
+ 	     idx,
+@@ -35,8 +35,7 @@
+ 	     firsttime = TRUE,
+ 	     dontdisplay = FALSE,
+ 	     unix_flag,
+-	     menu_flag,
+-	     exit();
++	     menu_flag;
+ 
+ 	static jmp_buf topenv;
+ 	static int topenvset;
+@@ -49,7 +48,7 @@
+ 	signal (SIGPIPE, SIG_IGN);	/* ignore dead pipes */
+ 	log("enter", m);
+ 
+-	while TRUE {
++	while (TRUE) {
+ 
+ 		if (!topenvset) {
+ 			topenvset = TRUE;
+@@ -142,7 +141,7 @@
+ 
+ 			if ( strcmp (action_string, NULLSTR) == 0 ) {
+ 				invalid_option = TRUE;
+-				printf ("\tNo such help option name as: %s\!\!\n", opt2);
++				printf ("\tNo such help option name as: %s!!\n", opt2);
+ 			}
+ 			else {
+ 				tmpword[0] = EOS;
diff --git a/misc/mshell/files/patch-ag b/misc/mshell/files/patch-ag
new file mode 100644
index 00000000000..3a538ac4e0b
--- /dev/null
+++ b/misc/mshell/files/patch-ag
@@ -0,0 +1,11 @@
+--- mshell.h.orig	Sun Oct 20 16:15:25 2002
++++ mshell.h	Sun Oct 20 16:14:30 2002
+@@ -5,7 +5,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifdef BSD
+-#include <sys/dir.h>		/* accessing the directory structure	*/
++#include <dirent.h>		/* accessing the directory structure	*/
+ #include <sgtty.h>		/* struct for terminal attributes       */
+ #endif
+ #ifdef SYSV
diff --git a/misc/mshell/files/patch-ah b/misc/mshell/files/patch-ah
new file mode 100644
index 00000000000..89985082114
--- /dev/null
+++ b/misc/mshell/files/patch-ah
@@ -0,0 +1,10 @@
+--- string.c.orig	Sun Oct 20 16:14:00 2002
++++ string.c	Sun Oct 20 16:14:08 2002
+@@ -271,7 +271,6 @@
+ 		/* if it has a multi-command delim, save rest for next time */
+ #define MULTI_CMD_DELIM ','
+ 		if (p = index(string, MULTI_CMD_DELIM)) {
+-			char *strsave();
+ 			struct inp_link *l;
+ 			*p++ = EOS;
+ 			if ((l=getnode(sizeof(*l))) && (l->input=strsave(p)))