svn commit: r227011 - head/usr.sbin/tzsetup

Doug Barton dougb at FreeBSD.org
Wed Nov 2 04:21:21 UTC 2011


Author: dougb
Date: Wed Nov  2 04:21:20 2011
New Revision: 227011
URL: http://svn.freebsd.org/changeset/base/227011

Log:
  If the user is moving from any other time zone to UTC we need
  to delete any old /var/db/zoneinfo file that may exist so that
  tzsetup -r does the right thing.

Modified:
  head/usr.sbin/tzsetup/tzsetup.c

Modified: head/usr.sbin/tzsetup/tzsetup.c
==============================================================================
--- head/usr.sbin/tzsetup/tzsetup.c	Wed Nov  2 00:21:03 2011	(r227010)
+++ head/usr.sbin/tzsetup/tzsetup.c	Wed Nov  2 04:21:20 2011	(r227011)
@@ -565,6 +565,18 @@ install_zoneinfo_file(const char *zonein
 
 				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));
+				if (usedialog)
+					dialog_mesgbox(title, prompt, 8, 72);
+				else
+					fprintf(stderr, "%s\n", prompt);
+
+				return (DITEM_FAILURE | DITEM_RECREATE);
+			}
 			return (DITEM_LEAVE_MENU);
 		}
 		


More information about the svn-src-all mailing list