increase -Werror resilience

for bin/, commands/, libexec/, sbin/, test/, usr.bin/ and usr.sbin/.

Change-Id: I8fa12c3cd86865311cef71b7faa7cf4fa785174f

bin/mkdir/Makefile

@@ -3,6 +3,7 @@
 
 PROG=	mkdir
 .ifdef __MINIX
+WARNS=3
 SYMLINKS=	$(BINDIR)/$(PROG) /usr/bin/$(PROG)
 .endif
 

bin/pax/Makefile

@@ -3,6 +3,10 @@
 
 .include <bsd.own.mk>
 
+.if defined(__MINIX)
+WARNS=3
+.endif
+
 PROG=   pax
 SRCS=	ar_io.c ar_subs.c buf_subs.c file_subs.c ftree.c\
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c\

bin/pax/ar_io.c

@@ -456,8 +456,13 @@ ar_close(void)
 
 	/* mimic cpio's block count first */
 	if (frmt && strcmp(NM_CPIO, argv0) == 0) {
+#ifdef __minix
+		(void)fprintf(listf, "%d blocks\n",
+		    (rdcnt ? rdcnt : wrcnt) / 5120);
+#else
 		(void)fprintf(listf, OFFT_F " blocks\n",
 		    (rdcnt ? rdcnt : wrcnt) / 5120);
+#endif
 	}
 
 	ar_summary(0);

bin/pax/file_subs.c

@@ -170,7 +170,6 @@ file_creat(ARCHD *arcn, int write_to_hardlink)
 			 * conservatively - just write Xes into the last component.
 			 * There is space because of the malloc().
 			 */
-			int cc;
 			char *last_slash;
 			strcpy(arcn->tmp_name, arcn->name);
 			if(!(last_slash = strrchr(arcn->tmp_name, '/')))

commands/Makefile.inc

@@ -1,2 +1,7 @@
 LDADD+= -lminlib -lcompat_minix -lasyn -lterminfo
 BINDIR?=/usr/bin
+
+# BJG too many warnings here
+NOGCCERROR?=    yes
+NOCLANGERROR?=  yes
+

libexec/ftpd/Makefile

@@ -6,6 +6,7 @@
 PROG=	ftpd
 SRCS=	cmds.c conf.c ftpd.c ftpcmd.y logutmp.c logwtmp.c popen.c
 .ifdef __MINIX
+WARNS=	# BJG too many warnings with clang right now
 CPPFLAGS+=-I${.CURDIR} 
 .else
 CPPFLAGS+=-I${.CURDIR} -DSUPPORT_UTMP -DSUPPORT_UTMPX -DLOGIN_CAP

sbin/fsck/Makefile

@@ -12,5 +12,6 @@ DPADD+=${LIBPROP}
 
 # LSC Does not compile without any warnings...
 NOGCCERROR:=yes
+NOCLANGERROR:=yes
 
 .include <bsd.prog.mk>

sbin/fsck/fsutil.c

@@ -265,8 +265,13 @@ print_mtime(time_t t)
 }
 
 
+#ifdef __minix
+__dead void
+catch(int n)
+#else
 void
 catch(int n)
+#endif
 {
 	if (ckfinish) (*ckfinish)(0);
 	_exit(FSCK_EXIT_SIGNALLED);

sbin/newfs_ext2fs/Makefile

@@ -1,6 +1,10 @@
 #	$NetBSD: Makefile,v 1.4 2012/03/24 08:22:24 joerg Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 
+.if defined(__MINIX)
+WARNS=3
+.endif
+
 WARNS?=	4
 
 CWARNFLAGS+=	-Wno-sign-compare

test/Makefile

@@ -19,6 +19,7 @@ COPTS.test51.c=	-mhard-float
 COPTS.test52.c=	-mhard-float
 .endif
 
+WARNS=
 COPTS.test9.c=	-O0
 COPTS.test37.c=	-O0
 COPTS.test53.c=	-O0

test/test55.c

@@ -15,7 +15,7 @@ int max_error = 3;
 int subtest;
 char *filename = "statvfs_test_XXXXXX";
 
-void create_file(void)
+static void create_file(void)
 {
 	char buf[SIZE]={0};
 	char *p;

usr.bin/chpass/Makefile

@@ -3,6 +3,10 @@
 
 .include <bsd.own.mk>
 
+.if defined(__MINIX)
+WARNS=3
+.endif
+
 USE_FORT?= yes	# setuid
 PROG=	chpass
 SRCS=	chpass.c edit.c field.c table.c util.c

usr.bin/login/Makefile

@@ -1,6 +1,10 @@
 #	$NetBSD: Makefile,v 1.55 2012/04/24 16:52:26 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
+.if defined(__MINIX)
+WARNS=2
+.endif
+
 WARNS?=	5
 
 .include <bsd.own.mk>

usr.bin/ministat/Makefile

@@ -3,6 +3,9 @@ PROG=	ministat
 DPADD=	${LIBM}
 LDADD=	-lm
 
+# BJG
+WARNS=3
+
 .include <bsd.prog.mk>
 
 test:	${PROG}

usr.bin/newgrp/Makefile

@@ -8,6 +8,11 @@ SRCS=	newgrp.c grutil.c
 BINOWN=	root
 BINMODE=4555
 
+.if defined(__MINIX)
+# Too many warnings for our clang otherwise
+WARNS=3
+.endif
+
 CPPFLAGS+=-DGRUTIL_ACCEPT_GROUP_NUMBERS
 CPPFLAGS+=-DGRUTIL_ALLOW_GROUP_ERRORS	# for POSIX.1 compliance
 .if !defined(__MINIX)

usr.bin/nvi/Makefile.inc

@@ -2,5 +2,10 @@
 
 .include <bsd.own.mk>
 
+.if defined(__MINIX)
+NOCLANGERROR=yes
+NOGCCERROR=yes
+.endif
+
 DIST= ${NETBSDSRCDIR}/dist/nvi
 .PATH: ${DIST}

usr.bin/passwd/Makefile

@@ -3,6 +3,10 @@
 
 .include <bsd.own.mk>
 
+.if defined(__MINIX)
+WARNS=3
+.endif
+
 USE_FORT?= yes	# setuid
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c

usr.bin/sort/fields.c

@@ -393,7 +393,7 @@ numhex(u_char *pos, const u_char *bufend, u_char *line, u_char *lineend,
 	int64_t n = 0;
 	int l;
 	SKIP_BLANKS(line);
-	sscanf((const char *) pos, "%lx", &n);
+	sscanf((const char *) pos, "%llx", &n);
 	l = snprintf((char *)buf, sizeof(buf), "%lld", n);
 	return number(pos, bufend, buf, buf + l, flag);
 }

usr.bin/top/top.c

@@ -47,7 +47,7 @@ u32_t system_hz;
 /* name of cpu cycle types, in the order they appear in /psinfo. */
 const char *cputimenames[] = { "user", "ipc", "kernelcall" };
 
-#define CPUTIMENAMES (sizeof(cputimenames)/sizeof(cputimenames[0]))
+#define CPUTIMENAMES ((int) (sizeof(cputimenames)/sizeof(cputimenames[0])))
 
 #define CPUTIME(m, i) (m & (1L << (i)))
 

usr.bin/toproto/toproto.c

@@ -276,7 +276,7 @@ create_entries(int handle)
 	return 0;
 }
 
-char * parse_mode(int mode){
+static char * parse_mode(int mode){
 	/* Convert a 4 digit octal number int a proto  entry as described in
    the mkfs.mfs man page e.g. [suid-char][guid-char]0777 mode */
 
@@ -290,7 +290,7 @@ char * parse_mode(int mode){
 }
 
 static int
-dump_entry(FILE * out, int index, char *base_dir)
+dump_entry(FILE * out, int index, const char *base_dir)
 {
 
 	int space;
@@ -346,7 +346,7 @@ dump_entry(FILE * out, int index, char *base_dir)
 }
 
 static int
-dump_proto(FILE * out, char *base_dir)
+dump_proto(FILE * out, const char *base_dir)
 {
 	int i;
 	fprintf(out, "boot\n0 0");
@@ -377,7 +377,7 @@ main(int argc, char **argv)
 {
 	int ch, fh_in;
 	FILE *out;
-	char *base_path;
+	const char *base_path;
 	char *input_file, *output_file;
 
 	input_file = NULL;

usr.sbin/Makefile.inc

@@ -3,3 +3,7 @@
 
 BINDIR?=	/usr/sbin
 WARNS?=		4
+
+# BJG too many warnings here
+NOGCCERROR?=    yes
+NOCLANGERROR?=  yes