Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a

merge of parallel duplicate work by Steve Price and myself. :-]

There are some changes to the build that are my fault...  mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do.  The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.

This closes a pile of /bin/sh PR's, but not all of them..

Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter

1 files changed, 25 insertions, 29 deletions

diff --git a/bin/sh/options.h b/bin/sh/options.h
index 095dc29..33131d3 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -33,8 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)options.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	@(#)options.h	8.2 (Berkeley) 5/4/95
+ *	$Id: options.h,v 1.2 1994/09/24 02:58:05 davidg Exp $
  */
 
 struct shparam {
@@ -73,21 +73,21 @@ struct optent {
 
 #ifdef DEFINE_OPTIONS
 struct optent optlist[NOPTS] = {
-	"errexit",	'e',	0,
-	"noglob",	'f',	0,
-	"ignoreeof",	'I',	0,
-	"interactive",	'i',	0,
-	"monitor",	'm',	0,
-	"noexec",	'n',	0,
-	"stdin",	's',	0,
-	"xtrace",	'x',	0,
-	"verbose",	'v',	0,
-	"vi",		'V',	0,
-	"emacs",	'E',	0,
-	"noclobber",	'C',	0,
-	"allexport",	'a',	0,
-	"notify",	'b',	0,
-	"nounset",	'u',	0,
+	{ "errexit",	'e',	0 },
+	{ "noglob",	'f',	0 },
+	{ "ignoreeof",	'I',	0 },
+	{ "interactive",'i',	0 },
+	{ "monitor",	'm',	0 },
+	{ "noexec",	'n',	0 },
+	{ "stdin",	's',	0 },
+	{ "xtrace",	'x',	0 },
+	{ "verbose",	'v',	0 },
+	{ "vi",		'V',	0 },
+	{ "emacs",	'E',	0 },
+	{ "noclobber",	'C',	0 },
+	{ "allexport",	'a',	0 },
+	{ "notify",	'b',	0 },
+	{ "nounset",	'u',	0 },
 };
 #else
 extern struct optent optlist[NOPTS];
@@ -101,15 +101,11 @@ extern char **argptr;		/* argument list for builtin commands */
 extern char *optarg;		/* set by nextopt */
 extern char *optptr;		/* used by nextopt */
 
-
-#ifdef __STDC__
-void procargs(int, char **);
-void setparam(char **);
-void freeparam(struct shparam *);
-int nextopt(char *);
-#else
-void procargs();
-void setparam();
-void freeparam();
-int nextopt();
-#endif
+void procargs __P((int, char **)); 
+void optschanged __P((void));
+void setparam __P((char **));
+void freeparam __P((struct shparam *)); 
+int shiftcmd __P((int, char **));
+int setcmd __P((int, char **));
+int getoptscmd __P((int, char **));
+int nextopt __P((char *));