Module Name: src
Committed By: martin
Date: Tue Feb 12 18:32:15 UTC 2019
Modified Files:
src/usr.sbin/sysinst: Makefile.inc bsddisklabel.c defs.h partman.c
util.c
Log Message:
Backout previous snprintf nonsense, instead STFU gcc 7's most
useless warning ever.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.18 src/usr.sbin/sysinst/Makefile.inc:1.19
--- src/usr.sbin/sysinst/Makefile.inc:1.18 Mon Feb 11 19:15:38 2019
+++ src/usr.sbin/sysinst/Makefile.inc Tue Feb 12 18:32:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2019/02/11 19:15:38 martin Exp $
+# $NetBSD: Makefile.inc,v 1.19 2019/02/12 18:32:15 martin Exp $
#
# Makefile for sysinst
@@ -104,6 +104,10 @@ COPTS += -Os
CPPFLAGS+=-DINET6
.endif
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+=-Wno-format-truncation # most useless gcc warning ever
+.endif
+
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.label.c+= -Wno-pointer-sign
.endif
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.7 src/usr.sbin/sysinst/bsddisklabel.c:1.8
--- src/usr.sbin/sysinst/bsddisklabel.c:1.7 Mon Feb 11 20:40:18 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Tue Feb 12 18:32:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.7 2019/02/11 20:40:18 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.8 2019/02/12 18:32:15 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -224,7 +224,7 @@ set_ptn_size(menudesc *m, void *arg)
if (size == 0)
size = p->dflt_size;
size /= sizemult;
- trunc_snprintf(dflt, sizeof dflt, "%" PRIi64 "%s",
+ snprintf(dflt, sizeof dflt, "%" PRIi64 "%s",
size, p == pi->pool_part ? "+" : "");
for (;;) {
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.32 src/usr.sbin/sysinst/defs.h:1.33
--- src/usr.sbin/sysinst/defs.h:1.32 Mon Feb 11 20:40:18 2019
+++ src/usr.sbin/sysinst/defs.h Tue Feb 12 18:32:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.32 2019/02/11 20:40:18 martin Exp $ */
+/* $NetBSD: defs.h,v 1.33 2019/02/12 18:32:15 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -561,9 +561,6 @@ void do_reinstall_sets(void);
void restore_etc(void);
/* from util.c */
-/* like snprintf, but always terminates the output */
-void trunc_snprintf(char * restrict str, size_t size,
- const char * restrict format, ...) __printflike(3, 4);
char* str_arg_subst(const char *, size_t, const char **);
void msg_display_subst(const char *, size_t, ...);
int ask_yesno(const char *);
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.29 src/usr.sbin/sysinst/partman.c:1.30
--- src/usr.sbin/sysinst/partman.c:1.29 Mon Feb 11 20:40:18 2019
+++ src/usr.sbin/sysinst/partman.c Tue Feb 12 18:32:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.29 2019/02/11 20:40:18 martin Exp $ */
+/* $NetBSD: partman.c,v 1.30 2019/02/12 18:32:15 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -260,14 +260,14 @@ pm_getdevstring(char *buf, int len, pm_d
if (pm_cur->isspecial)
snprintf(buf, len, "%s", pm_cur->diskdev);
else if (num + 'a' < 'a' || num + 'a' > 'a' + MAXPARTITIONS) {
- trunc_snprintf(buf, len, "%sd", pm_cur->diskdev);
+ snprintf(buf, len, "%sd", pm_cur->diskdev);
} else if (pm_cur->gpt) {
for (i = 0; i < MAX_WEDGES; i++)
if (wedges[i].pm == pm_cur &&
wedges[i].ptn == num)
snprintf(buf, len, "dk%d", i); // XXX: xxx
} else {
- trunc_snprintf(buf, len, "%s%c", pm_cur->diskdev, num + 'a');
+ snprintf(buf, len, "%s%c", pm_cur->diskdev, num + 'a');
}
return;
@@ -1903,7 +1903,7 @@ pm_getrefdev(pm_devs_t *pm_cur)
for (i = 0; i < MAX_CGD; i++)
if (cgds[i].blocked && cgds[i].node == dev_num) {
pm_cur->refdev = &cgds[i];
- trunc_snprintf(pm_cur->diskdev_descr,
+ snprintf(pm_cur->diskdev_descr,
sizeof(pm_cur->diskdev_descr),
"%s (%s, %s-%d)",
pm_cur->diskdev_descr, cgds[i].pm_name,
@@ -1917,7 +1917,7 @@ pm_getrefdev(pm_devs_t *pm_cur)
pm_cur->refdev = &vnds[i];
pm_getdevstring(dev, SSTRSIZE, vnds[i].pm,
vnds[i].pm_part);
- trunc_snprintf(pm_cur->diskdev_descr,
+ snprintf(pm_cur->diskdev_descr,
sizeof(pm_cur->diskdev_descr),
"%s (%s, %s)",
pm_cur->diskdev_descr, dev,
@@ -1937,7 +1937,7 @@ pm_getrefdev(pm_devs_t *pm_cur)
else
num_devs++;
}
- trunc_snprintf(pm_cur->diskdev_descr,
+ snprintf(pm_cur->diskdev_descr,
sizeof(pm_cur->diskdev_descr),
"%s (lvl %d, %d disks, %d spare)", pm_cur->diskdev_descr,
raids[i].raid_level, num_devs, num_devs_s);
@@ -2191,7 +2191,7 @@ pm_mount(pm_devs_t *pm_cur, int part_num
if (strlen(pm_cur->bsdlabel[part_num].mounted) > 0)
return 0;
- trunc_snprintf(buf, sizeof(buf), "/tmp/%s%c", pm_cur->diskdev,
+ snprintf(buf, sizeof(buf), "/tmp/%s%c", pm_cur->diskdev,
part_num + 'a');
if (! dir_exists_p(buf))
run_program(RUN_DISPLAY | RUN_PROGRESS, "/bin/mkdir -p %s", buf);
@@ -2539,7 +2539,7 @@ pm_menufmt(menudesc *m, int opt, void *a
pm_cur->bsdlabel[part_num].pi_size / (MEG / pm_cur->sectorsize));
break;
case PM_SPEC_T:
- trunc_snprintf(buf, sizeof(buf), "%s: %s",
+ snprintf(buf, sizeof(buf), "%s: %s",
pm_cur->diskdev_descr,
pm_cur->bsdlabel[0].pi_mount);
wprintw(m->mw, "%-33.32s %-22.21s %11luM", buf,
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.20 src/usr.sbin/sysinst/util.c:1.21
--- src/usr.sbin/sysinst/util.c:1.20 Mon Feb 11 20:40:18 2019
+++ src/usr.sbin/sysinst/util.c Tue Feb 12 18:32:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.20 2019/02/11 20:40:18 martin Exp $ */
+/* $NetBSD: util.c,v 1.21 2019/02/12 18:32:15 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1882,20 +1882,3 @@ msg_display_subst(const char *master, si
free(args);
}
-/*
- * like snprintf, but always terminates the output
- */
-void
-trunc_snprintf(char * restrict str, size_t size,
- const char * restrict format, ...)
-{
- int r;
- va_list ap;
-
- va_start(ap, format);
- r = vsnprintf(str, size, format, ap);
- va_end(ap);
-
- if (r >= (int)size)
- str[size-1] = 0;
-}
