D45575.id139804.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45575.id139804.diff
View Options

	Index: usr.sbin/tzsetup/tzsetup.c
	===================================================================
	--- usr.sbin/tzsetup/tzsetup.c
	+++ usr.sbin/tzsetup/tzsetup.c
	@@ -902,23 +902,29 @@
	char prompt[128];
	int fd;
	#endif
	- int c, rv, skiputc;
	+ int c, rv;
	+ bool skiputc;
	char vm_guest[16] = "";
	size_t len = sizeof(vm_guest);
	char *dztpath;

	dztpath = NULL;
	- skiputc = 0;
	+#if defined(__i386__) \|\| defined(__amd64__)
	+ skiputc = false;
	+
	+ /* Default skiputc to true for VM guests */
	+ if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 &&
	+ strcmp(vm_guest, "none") != 0)
	+ skiputc = true;
	+
	+#else
	+ skiputc = true;
	+#endif

	#ifdef HAVE_BSDDIALOG
	setlocale(LC_ALL, "");
	#endif

	- /* Default skiputc to 1 for VM guests */
	- if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 &&
	- strcmp(vm_guest, "none") != 0)
	- skiputc = 1;
	-
	while ((c = getopt(argc, argv, "C:cd:lnrs")) != -1) {
	switch (c) {
	case 'C':
	@@ -943,7 +949,7 @@
	#endif
	break;
	case 's':
	- skiputc = 1;
	+ skiputc = true;
	break;
	default:
	usage();
	@@ -1038,7 +1044,7 @@
	if (bsddialog_init() == BSDDIALOG_ERROR)
	errx(1, "Error bsddialog: %s\n", bsddialog_geterror());

	- if (skiputc == 0) {
	+ if (!skiputc) {
	snprintf(prompt, sizeof(prompt),
	"Is this machine's CMOS clock set to UTC? "
	"If it is set to local time,\n"