d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a menu entry for UTC in the main menu.

Browse Source 
PR:		bin/156019
Submitted by:	Daniel O'Conner
Reviewed by:	Garrett Cooper <gcooper@FreeBSD.org>
MFC after:	1 week
This commit is contained in:
Edwin Groothuis 2011-03-30 21:33:23 +00:00
parent 20d3bac00f
commit 75a59404d5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=220172
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
usr.sbin/tzsetup/tzsetup.c
View File

@ -66,10 +66,13 @@ static int usedialog = 1;
static char *chrootenv = NULL;
static void usage(void);
static int confirm_zone(const char *filename);
static int continent_country_menu(dialogMenuItem *);
static int install_zoneinfo_file(const char *zoneinfo_file);
static int set_zone_multi(dialogMenuItem *);
static int set_zone_whole_country(dialogMenuItem *);
static int set_zone_menu(dialogMenuItem *);
static int set_zone_utc(void);
struct continent {
dialogMenuItem *menu;
@ -79,7 +82,7 @@ struct continent {
};
static struct continent africa, america, antarctica, arctic, asia, atlantic;
static struct continent australia, europe, indian, pacific;
static struct continent australia, europe, indian, pacific, utc;
static struct continent_names {
const char *name;
@ -94,7 +97,8 @@ static struct continent_names {
{ "Australia", &australia },
{ "Europe", &europe },
{ "Indian", &indian },
{ "Pacific", &pacific }
{ "Pacific", &pacific },
{ "UTC", &utc }
};
static struct continent_items {
@ -110,7 +114,8 @@ static struct continent_items {
{ "7", "Australia" },
{ "8", "Europe" },
{ "9", "Indian Ocean" },
{ "0", "Pacific Ocean" }
{ "0", "Pacific Ocean" },
{ "a", "UTC" }
};
#define NCONTINENTS \
@ -128,6 +133,9 @@ continent_country_menu(dialogMenuItem *continent)
int menulen;
int rv;
if (strcmp(continent->title, "UTC") == 0)
return set_zone_utc();
/* Short cut -- if there's only one country, don't post a menu. */
if (contp->nitems == 1)
return (contp->menu[0].fire(&contp->menu[0]));
@ -502,6 +510,15 @@ set_zone_menu(dialogMenuItem *dmi)
return (DITEM_LEAVE_MENU);
}
int
set_zone_utc(void)
{
if (!confirm_zone(NULL))
return (DITEM_FAILURE | DITEM_RECREATE);
return (install_zoneinfo_file(NULL));
}
static int
install_zoneinfo_file(const char *zoneinfo_file)
{
@ -526,7 +543,8 @@ install_zoneinfo_file(const char *zoneinfo_file)
else
snprintf(prompt, sizeof(prompt),
"Creating symbolic link %s to %s",
path_localtime, zoneinfo_file);
path_localtime,
zoneinfo_file == NULL ? "(UTC)" : zoneinfo_file);
if (usedialog)
dialog_notify(prompt);
else
@ -534,6 +552,22 @@ 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));
if (usedialog)
dialog_mesgbox(title, prompt, 8, 72);
else
fprintf(stderr, "%s\n", prompt);
return (DITEM_FAILURE | DITEM_RECREATE);
}
return (DITEM_LEAVE_MENU);
}
if (copymode) {
fd1 = open(zoneinfo_file, O_RDONLY, 0);
if (fd1 < 0) {
@ -656,7 +690,7 @@ confirm_zone(const char *filename)
struct tm *tm;
int rv;
setenv("TZ", filename, 1);
setenv("TZ", filename == NULL ? "" : filename, 1);
tzset();
tm = localtime(&t);