Turn on strict-prototypes, add missing prototypes.

Move main prototype to main.c, as this is not used
from any other file.

Close open bug.

5 files changed, 13 insertions, 12 deletions

diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 52f781f3fdd..a9f601f0d02 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.10 1999/10/05 21:50:34 espie Exp $
+#	$OpenBSD: Makefile,v 1.11 1999/11/10 14:11:49 espie Exp $
 
 PROG=	make
-CFLAGS+= -I${.CURDIR} -Wall -Wno-char-subscripts -Wno-unused #-Wmissing-prototypes -Wstrict-prototypes
+CFLAGS+= -I${.CURDIR} -Wall -Wno-char-subscripts -Wno-unused -Wstrict-prototypes#-Wmissing-prototypes -Wstrict-prototypes
 
 .if (${MACHINE_ARCH} == "m88k")
 CFLAGS+=-O0
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 6766167845b..b77d6be6413 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compat.c,v 1.12 1998/12/05 00:06:27 espie Exp $	*/
+/*	$OpenBSD: compat.c,v 1.13 1999/11/10 14:11:49 espie Exp $	*/
 /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: compat.c,v 1.12 1998/12/05 00:06:27 espie Exp $";
+static char rcsid[] = "$OpenBSD: compat.c,v 1.13 1999/11/10 14:11:49 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -87,6 +87,7 @@ static GNode	    *ENDNode;
 static void CompatInterrupt __P((int));
 static int CompatRunCommand __P((ClientData, ClientData));
 static int CompatMake __P((ClientData, ClientData));
+static int shellneed __P((char **av));
 
 /*-
  *-----------------------------------------------------------------------
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 0394e62501d..a030406a5c0 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.15 1999/01/09 16:45:02 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.16 1999/11/10 14:11:49 espie Exp $	*/
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 1999/01/09 16:45:02 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.16 1999/11/10 14:11:49 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -140,6 +140,7 @@ static void		MainParseArgs __P((int, char **));
 char *			chdir_verify_path __P((char *, char *));
 static int		ReadMakefile __P((ClientData, ClientData));
 static void		usage __P((void));
+int 			main __P((int, char **));
 
 static char *curdir;			/* startup directory */
 static char *objdir;			/* where we chdir'ed to */
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 7d0b1905fd3..ed24a0d944c 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.21 1999/11/06 14:43:57 espie Exp $
+.\"	$OpenBSD: make.1,v 1.22 1999/11/10 14:11:49 espie Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -1199,9 +1199,6 @@ won't work, and should be rewritten the other way around.
 .Pp
 Syntax errors in for loops yield erroneous line numbers.
 .Pp
-End of file handling is not consistent. Some missing newlines are reported
-as weird errors, others are ignored silently.
-.Pp
 Command-line expansion as in
 .Bd -literal
 VAR != cat /dev/null
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index da1c844e612..bc19a93b9cd 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.13 1999/11/06 14:34:42 espie Exp $	*/
+/*	$OpenBSD: var.c,v 1.14 1999/11/10 14:11:49 espie Exp $	*/
 /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: var.c,v 1.13 1999/11/06 14:34:42 espie Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.14 1999/11/10 14:11:49 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -200,6 +200,8 @@ static char *VarModify __P((char *, Boolean (*)(char *, Boolean, Buffer,
 						ClientData),
 			    ClientData));
 static int VarPrintVar __P((ClientData, ClientData));
+static Boolean VarUppercase __P((char *word, Boolean addSpace, Buffer buf, ClientData dummy));
+static Boolean VarLowercase __P((char *word, Boolean addSpace, Buffer buf, ClientData dummy));
 
 /*-
  *-----------------------------------------------------------------------