increase -Werror resilience

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

Change-Id: I8fa12c3cd86865311cef71b7faa7cf4fa785174f

diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index c3aca13a91f6ba7d9100335b406853d555e37e94..e8b7f39ebd8b89bd4faa6aac4935fbaa15fa9cf5 100644 (file)
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -3,6 +3,7 @@
 
 PROG=  mkdir
 .ifdef __MINIX
+WARNS=3
 SYMLINKS=      $(BINDIR)/$(PROG) /usr/bin/$(PROG)
 .endif
 

diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index 0e6e13e136d1f61e30b3a6c994c512fb069073ab..5758ee9cb5faca48426ec801cc184b5c2fd88a81 100644 (file)
--- a/bin/pax/Makefile
+++ b/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\

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 164740a26a8452617eaaedb098759799e603805c..d3d69a45fb4f2482d66c17fabc0a93d245168a12 100644 (file)
--- a/bin/pax/ar_io.c
+++ b/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);

diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index f4e598dfd886e21ac6f58ec76bdb5204bdcb3f2b..4b16abf7d6c2d8055b53f2d7cb9dc06f0c18175e 100644 (file)
--- a/bin/pax/file_subs.c
+++ b/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, '/')))

diff --git a/commands/Makefile.inc b/commands/Makefile.inc
index 26905505e37218d9694b6daf214477f9546c3685..70e446b607b6eec7b3a43bb5c319e019da51fb3d 100644 (file)
--- a/commands/Makefile.inc
+++ b/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
+

diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 615c9bd7ff71587cbdd0e04b11e6674df7a00363..1ca6f34551df9df8417f63c9fb3e387f3bba66d5 100644 (file)
--- a/libexec/ftpd/Makefile
+++ b/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

diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index 3f65baf345b459169ecd9975d6e790c61be0933e..fb445ce16165cd0725c5eb2cf4834913b9f352b5 100644 (file)
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -12,5 +12,6 @@ DPADD+=${LIBPROP}
 
 # LSC Does not compile without any warnings...
 NOGCCERROR:=yes
+NOCLANGERROR:=yes
 
 .include <bsd.prog.mk>

diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index b249a3ea8d449d7f1384a23e377e990e70dbdba5..1aa31c6cc62bf3ef1d66d641361dc48bb346dcf5 100644 (file)
--- a/sbin/fsck/fsutil.c
+++ b/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);

diff --git a/sbin/newfs_ext2fs/Makefile b/sbin/newfs_ext2fs/Makefile
index 374e76f5b9070fd32fe50299b962403d40ad35e4..a09444544b3ee41222e8d5cf5d3cf557e972d5d2 100644 (file)
--- a/sbin/newfs_ext2fs/Makefile
+++ b/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

diff --git a/test/Makefile b/test/Makefile
index 17c74164421df90daa02091e72049a9b3d101c9e..dc927a5db1728abc67bb63215b1a2dc61b35dd83 100644 (file)
--- a/test/Makefile
+++ b/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

diff --git a/test/test55.c b/test/test55.c
index 700ee1a145fa09e514f11388c9afdf8628caf688..f6974da8d55f9a5a035584012ad5eadee769605b 100644 (file)
--- a/test/test55.c
+++ b/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;

diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index fb7462fed2126e14fd5b2cd63cb13143621510f5..b23a2d149d0a3193b11615617233967ca499e1bc 100644 (file)
--- a/usr.bin/chpass/Makefile
+++ b/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

diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index eb36b441ad63b2d9d47065103c9466b46282bd14..8e78aef5fcb45f6f32f3bb1deed1a89735efbf83 100644 (file)
--- a/usr.bin/login/Makefile
+++ b/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>

diff --git a/usr.bin/ministat/Makefile b/usr.bin/ministat/Makefile
index e4c2f0718291550f3ac305c24175aaa7a0dcbaab..ab160ad1e8c53839af28ce417e8bd4873fe8cdb8 100644 (file)
--- a/usr.bin/ministat/Makefile
+++ b/usr.bin/ministat/Makefile
@@ -3,6 +3,9 @@ PROG=   ministat
 DPADD= ${LIBM}
 LDADD= -lm
 
+# BJG
+WARNS=3
+
 .include <bsd.prog.mk>
 
 test:  ${PROG}

diff --git a/usr.bin/newgrp/Makefile b/usr.bin/newgrp/Makefile
index d04ebc1c52057a00b95e2c0141e1211ac0cd0b9d..ac100ffd66f854565dd13fd4fb5495cef0b2f3e2 100644 (file)
--- a/usr.bin/newgrp/Makefile
+++ b/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)

diff --git a/usr.bin/nvi/Makefile.inc b/usr.bin/nvi/Makefile.inc
index 3173631780eb0cf467c5d5cf76c35de25f624cbf..1ad6aa3b107e8dfd027cd12c848475fb3239c686 100644 (file)
--- a/usr.bin/nvi/Makefile.inc
+++ b/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}

diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index cffd0975e58286867064f24f89b295825e461e3a..eeb93a138aff06eeb178ab3fac950e6187086e62 100644 (file)
--- a/usr.bin/passwd/Makefile
+++ b/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

diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c
index 94cb23ca5afdf48288fbede55934aac3fb728123..d3071dffa9e4880777ccfe9eeab08274cc3c4e94 100644 (file)
--- a/usr.bin/sort/fields.c
+++ b/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);
 }

diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index f0db4406dda85c26c43b98662f898783f59410c1..5ff979268022df6f2f38d45fc6c1444172417336 100644 (file)
--- a/usr.bin/top/top.c
+++ b/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)))
 

diff --git a/usr.bin/toproto/toproto.c b/usr.bin/toproto/toproto.c
index 1747e284ae33681ef534ec5c508e1aa91b8e7ddb..df7aa305d07fa5be025fc6cbd560b229a242cd4e 100644 (file)
--- a/usr.bin/toproto/toproto.c
+++ b/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;

diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index ddb25e755c8fc3fe90686f34e9087530f66f295a..7314482de82685b3a29c2295a982f423de3fb405 100644 (file)
--- a/usr.sbin/Makefile.inc
+++ b/usr.sbin/Makefile.inc
@@ -3,3 +3,7 @@
 
 BINDIR?=       /usr/sbin
 WARNS?=                4
+
+# BJG too many warnings here
+NOGCCERROR?=    yes
+NOCLANGERROR?=  yes