aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2017-08-05 12:59:03 +0000
committerMarius Strobl <marius@FreeBSD.org>2017-08-05 12:59:03 +0000
commit4b38286169be0e7d7fc24664695afdba5e1930b9 (patch)
tree64f35d85e246d83bf22d546f592ef84a81cc23bb
parent609d1acfebdc1ed0aeb59722106a2af594d878d8 (diff)
downloadsrc-4b38286169be0e7d7fc24664695afdba5e1930b9.tar.gz
src-4b38286169be0e7d7fc24664695afdba5e1930b9.zip
- Move creation and unlinking of /etc/wall_cmos_clock from the handling
of the initial UTC dialog to install_zoneinfo() so that file gets the necessary treatment also when that dialog is skipped via "-s", when selecting UTC from the time zone menu or on the command-line instead etc. - Make the initial UTC dialog actually work by giving the relevant files the necessary treatment and then exit when choosing "Yes" there instead of moving on to the time zone menu regardless. - Since r301131, /etc/localtime is also installed when selecting UTC in interactive configurations (which previously meant only via the time zone menu, though). Thus, the code added in r230298 which treats a NULL zone file name as UTC and removes /etc/localtime in that case can go again. - Consistently refer to "could not delete" (as chosen by the oldest such code in here) when unlink(2) fails instead of a to mixture of "delete" and "unlink" in error messages.
Notes
Notes: svn path=/head/; revision=322097
-rw-r--r--usr.sbin/tzsetup/tzsetup.c124
1 files changed, 54 insertions, 70 deletions
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index 2637924f24c0..e51aaef57f39 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -107,7 +107,7 @@ xdialog_count_rows(const char *p)
rows++;
}
- return rows ? rows : 1;
+ return (rows ? rows : 1);
}
static int
@@ -124,7 +124,7 @@ xdialog_count_columns(const char *p)
len = strlen(p);
max_len = MAX(max_len, len);
- return max_len;
+ return (max_len);
}
static int
@@ -164,7 +164,8 @@ xdialog_menu(const char *title, const char *cprompt, int height, int width,
tag_x = MAX(tag_x, l + k + 2);
}
}
- width = MAX(xdialog_count_columns(cprompt), title != NULL ? xdialog_count_columns(title) : 0);
+ width = MAX(xdialog_count_columns(cprompt), title != NULL ?
+ xdialog_count_columns(title) : 0);
width = MAX(width, tag_x + 4) + 4;
}
width = MAX(width, 24);
@@ -199,7 +200,7 @@ again:
free(listitems);
dlg_restore_vars(&save_vars);
- return result;
+ return (result);
}
static int usedialog = 1;
@@ -269,7 +270,7 @@ continent_country_menu(dialogMenuItem *continent)
int rv;
if (strcmp(continent->title, "UTC") == 0)
- return set_zone_utc();
+ return (set_zone_utc());
/* Short cut -- if there's only one country, don't post a menu. */
if (contp->nitems == 1)
@@ -642,7 +643,7 @@ set_zone_menu(dialogMenuItem *dmi)
static int
set_zone_utc(void)
{
- if (!confirm_zone(NULL))
+ if (!confirm_zone("UTC"))
return (DITEM_FAILURE | DITEM_RECREATE);
return (install_zoneinfo("UTC"));
@@ -656,7 +657,7 @@ confirm_zone(const char *filename)
struct tm *tm;
int rv;
- setenv("TZ", filename == NULL ? "" : filename, 1);
+ setenv("TZ", filename, 1);
tzset();
tm = localtime(&t);
@@ -714,10 +715,7 @@ install_zoneinfo_file(const char *zoneinfo_file)
#ifdef VERBOSE
snprintf(title, sizeof(title), "Info");
- if (zoneinfo_file == NULL)
- snprintf(prompt, sizeof(prompt),
- "Removing %s", path_localtime);
- else if (copymode)
+ if (copymode)
snprintf(prompt, sizeof(prompt),
"Copying %s to %s", zoneinfo_file, path_localtime);
else
@@ -733,49 +731,6 @@ install_zoneinfo_file(const char *zoneinfo_file)
#endif
if (reallydoit) {
- if (zoneinfo_file == NULL) {
- if (unlink(path_localtime) < 0 && errno != ENOENT) {
- snprintf(title, sizeof(title), "Error");
- snprintf(prompt, sizeof(prompt),
- "Could not delete %s: %s", path_localtime,
- strerror(errno));
-#ifdef HAVE_DIALOG
- if (usedialog)
- dialog_msgbox(title, prompt, 8, 72, 1);
- else
-#endif
- fprintf(stderr, "%s\n", prompt);
-
- return (DITEM_FAILURE | DITEM_RECREATE);
- }
- if (unlink(path_db) < 0 && errno != ENOENT) {
- snprintf(title, sizeof(title), "Error");
- snprintf(prompt, sizeof(prompt),
- "Could not delete %s: %s", path_db,
- strerror(errno));
-#ifdef HAVE_DIALOG
- if (usedialog)
- dialog_msgbox(title, prompt, 8, 72, 1);
- else
-#endif
- fprintf(stderr, "%s\n", prompt);
-
- return (DITEM_FAILURE | DITEM_RECREATE);
- }
-#ifdef VERBOSE
- snprintf(title, sizeof(title), "Done");
- snprintf(prompt, sizeof(prompt),
- "Removed %s", path_localtime);
-#ifdef HAVE_DIALOG
- if (usedialog)
- dialog_msgbox(title, prompt, 8, 72, 1);
- else
-#endif
- fprintf(stderr, "%s\n", prompt);
-#endif
- return (DITEM_LEAVE_MENU);
- }
-
if (copymode) {
fd1 = open(zoneinfo_file, O_RDONLY, 0);
if (fd1 < 0) {
@@ -794,7 +749,7 @@ install_zoneinfo_file(const char *zoneinfo_file)
if (unlink(path_localtime) < 0 && errno != ENOENT) {
snprintf(prompt, sizeof(prompt),
- "Could not unlink %s: %s",
+ "Could not delete %s: %s",
path_localtime, strerror(errno));
#ifdef HAVE_DIALOG
if (usedialog) {
@@ -859,7 +814,7 @@ install_zoneinfo_file(const char *zoneinfo_file)
}
if (unlink(path_localtime) < 0 && errno != ENOENT) {
snprintf(prompt, sizeof(prompt),
- "Could not unlink %s: %s",
+ "Could not delete %s: %s",
path_localtime, strerror(errno));
#ifdef HAVE_DIALOG
if (usedialog) {
@@ -911,9 +866,47 @@ install_zoneinfo_file(const char *zoneinfo_file)
static int
install_zoneinfo(const char *zoneinfo)
{
- int rv;
+ int fd, rv;
FILE *f;
char path_zoneinfo_file[MAXPATHLEN];
+ char prompt[SILLY_BUFFER_SIZE], title[64];
+
+ if (reallydoit) {
+ if (strcmp(zoneinfo, "UTC") == 0) {
+ if (unlink(path_wall_cmos_clock) < 0 &&
+ errno != ENOENT) {
+ snprintf(title, sizeof(title), "Error");
+ snprintf(prompt, sizeof(prompt),
+ "Could not delete %s: %s",
+ path_wall_cmos_clock, strerror(errno));
+#ifdef HAVE_DIALOG
+ if (usedialog)
+ dialog_msgbox(title, prompt, 8, 72, 1);
+ else
+#endif
+ fprintf(stderr, "%s\n", prompt);
+
+ return (DITEM_FAILURE | DITEM_RECREATE);
+ }
+ } else {
+ fd = open(path_wall_cmos_clock, O_WRONLY | O_CREAT |
+ O_TRUNC, S_IRUSR | S_IRGRP | S_IROTH);
+ if (fd < 0) {
+ snprintf(title, sizeof(title), "Error");
+ snprintf(prompt, sizeof(prompt),
+ "Could not create %s: %s",
+ path_wall_cmos_clock, strerror(errno));
+#ifdef HAVE_DIALOG
+ if (usedialog)
+ dialog_msgbox(title, prompt, 8, 72, 1);
+ else
+#endif
+ fprintf(stderr, "%s\n", prompt);
+ return (DITEM_FAILURE | DITEM_RECREATE);
+ }
+ close(fd);
+ }
+ }
if ((size_t)snprintf(path_zoneinfo_file, sizeof(path_zoneinfo_file),
"%s/%s", path_zoneinfo, zoneinfo) >= sizeof(path_zoneinfo_file))
@@ -945,7 +938,6 @@ main(int argc, char **argv)
{
#ifdef HAVE_DIALOG
char title[64], prompt[128];
- int fd;
#endif
int c, rv, skiputc;
char vm_guest[16] = "";
@@ -1067,19 +1059,11 @@ main(int argc, char **argv)
yesno = dialog_yesno(title, prompt, 7, 73);
dlg_restore_vars(&save_vars);
if (!yesno) {
- if (reallydoit)
- unlink(path_wall_cmos_clock);
- } else {
if (reallydoit) {
- fd = open(path_wall_cmos_clock,
- O_WRONLY | O_CREAT | O_TRUNC,
- S_IRUSR | S_IRGRP | S_IROTH);
- if (fd < 0) {
- end_dialog();
- err(1, "create %s",
- path_wall_cmos_clock);
- }
- close(fd);
+ rv = install_zoneinfo("UTC");
+ dlg_clear();
+ end_dialog();
+ exit(rv & ~DITEM_LEAVE_MENU);
}
}
dlg_clear();