Module Name: src
Committed By: martin
Date: Sat Jun 23 17:49:58 UTC 2012
Modified Files:
src/distrib/utils/sysinst: main.c
Log Message:
Do not assign to a const pointer, but set the value of the target variable
instead. Makes sysinst at least start up again.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/utils/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.65 src/distrib/utils/sysinst/main.c:1.66
--- src/distrib/utils/sysinst/main.c:1.65 Fri Jun 22 20:54:39 2012
+++ src/distrib/utils/sysinst/main.c Sat Jun 23 17:49:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.65 2012/06/22 20:54:39 abs Exp $ */
+/* $NetBSD: main.c,v 1.66 2012/06/23 17:49:58 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -128,15 +128,12 @@ init(void)
mnt2_mounted = 0;
fd_type = "msdos";
- for (arg = fflagopts; arg->name != NULL; arg++)
- if (arg->var == cdrom_dev) {
- const char **dfltptr = __UNCONST(&arg->dflt);
- *dfltptr = get_default_cdrom();
- break;
- }
-
- for (arg = fflagopts; arg->name != NULL; arg++)
- strlcpy(arg->var, arg->dflt, arg->size);
+ for (arg = fflagopts; arg->name != NULL; arg++) {
+ if (arg->var == cdrom_dev)
+ strlcpy(arg->var, get_default_cdrom(), arg->size);
+ else
+ strlcpy(arg->var, arg->dflt, arg->size);
+ }
pkg.xfer_type = pkgsrc.xfer_type = "http";
}
