Module Name: src
Committed By: martin
Date: Sat Jun 9 15:19:28 UTC 2018
Modified Files:
src/usr.sbin/sysinst [netbsd-8]: bsddisklabel.c defs.h menus.mi net.c
partman.c util.c
src/usr.sbin/sysinst/arch/alpha [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/emips [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/hp300 [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/hppa [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/i386 [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/landisk [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/mipsco [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/mvme68k [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/pmax [netbsd-8]: md.c
src/usr.sbin/sysinst/arch/x68k [netbsd-8]: md.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #869):
usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.5
usr.sbin/sysinst/net.c: revision 1.24
usr.sbin/sysinst/partman.c: revision 1.22
usr.sbin/sysinst/menus.mi: revision 1.12
usr.sbin/sysinst/arch/i386/md.c: revision 1.8
usr.sbin/sysinst/arch/alpha/md.c: revision 1.3
usr.sbin/sysinst/bsddisklabel.c: revision 1.3
usr.sbin/sysinst/arch/x68k/md.c: revision 1.5
usr.sbin/sysinst/arch/hp300/md.c: revision 1.5
usr.sbin/sysinst/arch/emips/md.c: revision 1.4
usr.sbin/sysinst/arch/pmax/md.c: revision 1.3
usr.sbin/sysinst/arch/mipsco/md.c: revision 1.3
usr.sbin/sysinst/arch/hppa/md.c: revision 1.3
usr.sbin/sysinst/util.c: revision 1.8
usr.sbin/sysinst/defs.h: revision 1.10
usr.sbin/sysinst/arch/landisk/md.c: revision 1.4
deconst -> __UNCONST, the former involves UB with NULL arithmetic.
To generate a diff of this commit:
cvs rdiff -u -r1.2.20.1 -r1.2.20.2 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.9.8.1 -r1.9.8.2 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.11.6.1 -r1.11.6.2 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.23 -r1.23.6.1 src/usr.sbin/sysinst/net.c
cvs rdiff -u -r1.15.6.3 -r1.15.6.4 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/usr.sbin/sysinst/util.c
cvs rdiff -u -r1.2 -r1.2.20.1 src/usr.sbin/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/usr.sbin/sysinst/arch/emips/md.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.2 -r1.2.20.1 src/usr.sbin/sysinst/arch/hppa/md.c
cvs rdiff -u -r1.6.8.2 -r1.6.8.3 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.2 -r1.2.20.1 src/usr.sbin/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.2 -r1.2.20.1 src/usr.sbin/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.2 -r1.2.20.1 src/usr.sbin/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/usr.sbin/sysinst/arch/x68k/md.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/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.2.20.1 src/usr.sbin/sysinst/bsddisklabel.c:1.2.20.2
--- src/usr.sbin/sysinst/bsddisklabel.c:1.2.20.1 Tue Jun 5 08:12:54 2018
+++ src/usr.sbin/sysinst/bsddisklabel.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.2.20.1 2018/06/05 08:12:54 bouyer Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.2.20.2 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -803,7 +803,7 @@ check_partitions(void)
} else
rv = -1;
if (rv != 0) {
- process_menu(MENU_ok, deconst(MSG_No_Bootcode));
+ process_menu(MENU_ok, __UNCONST(MSG_No_Bootcode));
return 0;
}
#endif
@@ -811,7 +811,7 @@ check_partitions(void)
fstype = pm->bsdlabel[pm->rootpart].pi_fstype;
if (fstype == FS_BSDFFS &&
(pm->bsdlabel[pm->rootpart].pi_flags & PIF_FFSv2) != 0) {
- process_menu(MENU_ok, deconst(MSG_cannot_ufs2_root));
+ process_menu(MENU_ok, __UNCONST(MSG_cannot_ufs2_root));
return 0;
}
#endif
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.9.8.1 src/usr.sbin/sysinst/defs.h:1.9.8.2
--- src/usr.sbin/sysinst/defs.h:1.9.8.1 Tue Jun 5 08:12:54 2018
+++ src/usr.sbin/sysinst/defs.h Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.9.8.1 2018/06/05 08:12:54 bouyer Exp $ */
+/* $NetBSD: defs.h,v 1.9.8.2 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -45,12 +45,6 @@
const char *getfslabelname(uint8_t);
-static inline void *
-deconst(const void *p)
-{
- return (char *)0 + ((const char *)p - (const char *)0);
-}
-
#include "msg_defs.h"
#include "menu_defs.h"
Index: src/usr.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.11.6.1 src/usr.sbin/sysinst/menus.mi:1.11.6.2
--- src/usr.sbin/sysinst/menus.mi:1.11.6.1 Tue Jun 5 08:12:54 2018
+++ src/usr.sbin/sysinst/menus.mi Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.11.6.1 2018/06/05 08:12:54 bouyer Exp $ */
+/* $NetBSD: menus.mi,v 1.11.6.2 2018/06/09 15:19:27 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -664,7 +664,7 @@ menu pmpartentry, x=50, y=5, exit, defau
};
option MSG_fmtasraid, exit, action {
if (pm->gpt || pm->isspecial) {
- process_menu(MENU_ok, deconst(MSG_notsupported));
+ process_menu(MENU_ok, __UNCONST(MSG_notsupported));
return -1;
}
pm->unsaved = 1;
@@ -673,7 +673,7 @@ menu pmpartentry, x=50, y=5, exit, defau
};
option MSG_fmtaslvm, exit, action {
if (pm->gpt || pm->isspecial) {
- process_menu(MENU_ok, deconst(MSG_notsupported));
+ process_menu(MENU_ok, __UNCONST(MSG_notsupported));
return -1;
}
pm->unsaved = 1;
@@ -683,7 +683,7 @@ menu pmpartentry, x=50, y=5, exit, defau
};
option MSG_encrypt, exit, action {
if (pm->gpt || pm->isspecial) {
- process_menu(MENU_ok, deconst(MSG_notsupported));
+ process_menu(MENU_ok, __UNCONST(MSG_notsupported));
return -1;
}
pm->unsaved = 1;
Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.23 src/usr.sbin/sysinst/net.c:1.23.6.1
--- src/usr.sbin/sysinst/net.c:1.23 Tue Dec 13 19:03:49 2016
+++ src/usr.sbin/sysinst/net.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.23 2016/12/13 19:03:49 roy Exp $ */
+/* $NetBSD: net.c,v 1.23.6.1 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -964,7 +964,7 @@ get_via_ftp(const char *xfer_type)
arg_rv arg;
arg.rv = -1;
- arg.arg = deconst(xfer_type);
+ arg.arg = __UNCONST(xfer_type);
process_menu(MENU_ftpsource, &arg);
if (arg.rv == SET_RETRY)
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.15.6.3 src/usr.sbin/sysinst/partman.c:1.15.6.4
--- src/usr.sbin/sysinst/partman.c:1.15.6.3 Mon May 7 04:06:31 2018
+++ src/usr.sbin/sysinst/partman.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.15.6.3 2018/05/07 04:06:31 snj Exp $ */
+/* $NetBSD: partman.c,v 1.15.6.4 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -227,7 +227,7 @@ pm_edit(int menu_entries_count, void (*m
}
if (!ok) {
/* We do not have free device slots */
- process_menu(MENU_ok, deconst(MSG_limitcount));
+ process_menu(MENU_ok, __UNCONST(MSG_limitcount));
return -1;
}
}
@@ -357,7 +357,7 @@ pm_manage_getfreenode(void *node, const
return i;
}
}
- process_menu(MENU_ok, deconst(MSG_nofreedev));
+ process_menu(MENU_ok, __UNCONST(MSG_nofreedev));
return -1;
}
@@ -467,7 +467,7 @@ pm_raid_set_value(menudesc *m, void *arg
dev_ptr->raid_level = retvalue;
return 0;
case PMR_MENU_NUMROW:
- process_menu(MENU_ok, deconst(MSG_raid_nomultidim));
+ process_menu(MENU_ok, __UNCONST(MSG_raid_nomultidim));
return 0;
#if 0 /* notyet */
msg_to_show = MSG_raid_numrow_ask;
@@ -1748,7 +1748,7 @@ pm_wedges_fill(pm_devs_t *pm_cur)
if (pm_cur->bsdlabel[i].pi_fstype != FS_UNUSED) {
current = pm_wedge_getfree();
if (current < 0) {
- process_menu(MENU_ok, deconst(MSG_limitcount));
+ process_menu(MENU_ok, __UNCONST(MSG_limitcount));
return;
}
wedges[current].pm = pm_cur;
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.7 src/usr.sbin/sysinst/util.c:1.7.8.1
--- src/usr.sbin/sysinst/util.c:1.7 Mon May 11 13:07:57 2015
+++ src/usr.sbin/sysinst/util.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.7 2015/05/11 13:07:57 martin Exp $ */
+/* $NetBSD: util.c,v 1.7.8.1 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1724,7 +1724,7 @@ ask_yesno(const char* msgtxt)
{
arg_rv p;
- p.arg = deconst(msgtxt);
+ p.arg = __UNCONST(msgtxt);
p.rv = -1;
process_menu(MENU_yesno, &p);
@@ -1736,7 +1736,7 @@ ask_noyes(const char *msgtxt)
{
arg_rv p;
- p.arg = deconst(msgtxt);
+ p.arg = __UNCONST(msgtxt);
p.rv = -1;
process_menu(MENU_noyes, &p);
Index: src/usr.sbin/sysinst/arch/alpha/md.c
diff -u src/usr.sbin/sysinst/arch/alpha/md.c:1.2 src/usr.sbin/sysinst/arch/alpha/md.c:1.2.20.1
--- src/usr.sbin/sysinst/arch/alpha/md.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/arch/alpha/md.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.2.20.1 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -163,7 +163,7 @@ md_post_newfs(void)
if (error != 0)
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/emips/md.c
diff -u src/usr.sbin/sysinst/arch/emips/md.c:1.3 src/usr.sbin/sysinst/arch/emips/md.c:1.3.8.1
--- src/usr.sbin/sysinst/arch/emips/md.c:1.3 Sun May 10 10:14:02 2015
+++ src/usr.sbin/sysinst/arch/emips/md.c Sat Jun 9 15:19:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2015/05/10 10:14:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.3.8.1 2018/06/09 15:19:28 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -171,7 +171,7 @@ md_post_extract(void)
if (ask_noyes(NULL)) {
if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
"/bin/dd if=%s of=/dev/reflash0c bs=512", ldr_path))
- process_menu(MENU_ok, deconst("Warning: the system "
+ process_menu(MENU_ok, __UNCONST("Warning: the system "
"is probably not bootable"));
}
Index: src/usr.sbin/sysinst/arch/hp300/md.c
diff -u src/usr.sbin/sysinst/arch/hp300/md.c:1.4 src/usr.sbin/sysinst/arch/hp300/md.c:1.4.8.1
--- src/usr.sbin/sysinst/arch/hp300/md.c:1.4 Sun May 10 10:14:02 2015
+++ src/usr.sbin/sysinst/arch/hp300/md.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2015/05/10 10:14:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.4.8.1 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,7 +193,7 @@ md_post_newfs(void)
if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
"/usr/sbin/installboot /dev/r%sc /usr/mdec/uboot.lif", pm->diskdev))
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/hppa/md.c
diff -u src/usr.sbin/sysinst/arch/hppa/md.c:1.2 src/usr.sbin/sysinst/arch/hppa/md.c:1.2.20.1
--- src/usr.sbin/sysinst/arch/hppa/md.c:1.2 Sun Aug 3 16:09:39 2014
+++ src/usr.sbin/sysinst/arch/hppa/md.c Sat Jun 9 15:19:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.2.20.1 2018/06/09 15:19:28 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -188,7 +188,7 @@ md_post_newfs(void)
"/usr/sbin/installboot -v /dev/r%sc /usr/mdec/xxboot",
pm->diskdev))
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.6.8.2 src/usr.sbin/sysinst/arch/i386/md.c:1.6.8.3
--- src/usr.sbin/sysinst/arch/i386/md.c:1.6.8.2 Tue Jun 5 08:12:54 2018
+++ src/usr.sbin/sysinst/arch/i386/md.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6.8.2 2018/06/05 08:12:54 bouyer Exp $ */
+/* $NetBSD: md.c,v 1.6.8.3 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -251,7 +251,7 @@ md_check_partitions(void)
free(bootxx);
if (rval == 0)
return 1;
- process_menu(MENU_ok, deconst(MSG_No_Bootcode));
+ process_menu(MENU_ok, __UNCONST(MSG_No_Bootcode));
return 0;
}
@@ -380,7 +380,7 @@ md_post_newfs(void)
if (ret != 0)
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return ret;
}
Index: src/usr.sbin/sysinst/arch/landisk/md.c
diff -u src/usr.sbin/sysinst/arch/landisk/md.c:1.2 src/usr.sbin/sysinst/arch/landisk/md.c:1.2.20.1
--- src/usr.sbin/sysinst/arch/landisk/md.c:1.2 Sun Aug 3 16:09:40 2014
+++ src/usr.sbin/sysinst/arch/landisk/md.c Sat Jun 9 15:19:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */
+/* $NetBSD: md.c,v 1.2.20.1 2018/06/09 15:19:28 martin Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -136,7 +136,7 @@ md_post_newfs(void)
if (error != 0)
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/mipsco/md.c
diff -u src/usr.sbin/sysinst/arch/mipsco/md.c:1.2 src/usr.sbin/sysinst/arch/mipsco/md.c:1.2.20.1
--- src/usr.sbin/sysinst/arch/mipsco/md.c:1.2 Sun Aug 3 16:09:40 2014
+++ src/usr.sbin/sysinst/arch/mipsco/md.c Sat Jun 9 15:19:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */
+/* $NetBSD: md.c,v 1.2.20.1 2018/06/09 15:19:28 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -165,7 +165,7 @@ md_post_newfs(void)
if (run_program(RUN_DISPLAY | RUN_NO_CLEAR,
"/usr/mdec/installboot /dev/r%sc /usr/mdec/bootxx_ffs", pm->diskdev))
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/mvme68k/md.c
diff -u src/usr.sbin/sysinst/arch/mvme68k/md.c:1.4 src/usr.sbin/sysinst/arch/mvme68k/md.c:1.4.8.1
--- src/usr.sbin/sysinst/arch/mvme68k/md.c:1.4 Sun May 10 10:14:03 2015
+++ src/usr.sbin/sysinst/arch/mvme68k/md.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2015/05/10 10:14:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.4.8.1 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -194,7 +194,7 @@ md_post_newfs(void)
"/usr/mdec/installboot %s /usr/mdec/bootxx /dev/r%sa",
target_expand("/.bootsd"), pm->diskdev))
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/pmax/md.c
diff -u src/usr.sbin/sysinst/arch/pmax/md.c:1.2 src/usr.sbin/sysinst/arch/pmax/md.c:1.2.20.1
--- src/usr.sbin/sysinst/arch/pmax/md.c:1.2 Sun Aug 3 16:09:40 2014
+++ src/usr.sbin/sysinst/arch/pmax/md.c Sat Jun 9 15:19:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:40 martin Exp $ */
+/* $NetBSD: md.c,v 1.2.20.1 2018/06/09 15:19:28 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -173,7 +173,7 @@ md_post_newfs(void)
if (error != 0)
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
Index: src/usr.sbin/sysinst/arch/x68k/md.c
diff -u src/usr.sbin/sysinst/arch/x68k/md.c:1.4 src/usr.sbin/sysinst/arch/x68k/md.c:1.4.8.1
--- src/usr.sbin/sysinst/arch/x68k/md.c:1.4 Sun May 10 10:14:03 2015
+++ src/usr.sbin/sysinst/arch/x68k/md.c Sat Jun 9 15:19:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2015/05/10 10:14:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.4.8.1 2018/06/09 15:19:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -280,7 +280,7 @@ md_post_newfs(void)
"/usr/mdec/installboot.new /usr/mdec/sdboot_ufs /dev/r%sa",
pm->diskdev))
process_menu(MENU_ok,
- deconst("Warning: disk is probably not bootable"));
+ __UNCONST("Warning: disk is probably not bootable"));
return 0;
}
