Author: dteske
Date: Sun Mar 3 19:20:30 2013
New Revision: 247727
URL: http://svnweb.freebsd.org/changeset/base/247727
Log:
MFC r230299:
Fix #ifdef VERBOSE for UTC case
Update verbose output to match what actually happens when selecting
the UTC option, and when the -n option is used.
Patch updated slightly for new libdialog.
PR: bin/164042
Submitted by: dteske
Modified:
stable/9/usr.sbin/tzsetup/tzsetup.c
Modified: stable/9/usr.sbin/tzsetup/tzsetup.c
==============================================================================
--- stable/9/usr.sbin/tzsetup/tzsetup.c Sun Mar 3 19:12:07 2013
(r247726)
+++ stable/9/usr.sbin/tzsetup/tzsetup.c Sun Mar 3 19:20:30 2013
(r247727)
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD$");
#include <err.h>
#include <errno.h>
@@ -659,16 +659,19 @@ install_zoneinfo_file(const char *zonein
copymode = 1;
#ifdef VERBOSE
- if (copymode)
+ snprintf(title, sizeof(title), "Info");
+ if (zoneinfo_file == NULL)
+ snprintf(prompt, sizeof(prompt),
+ "Removing %s", path_localtime);
+ else if (copymode)
snprintf(prompt, sizeof(prompt),
"Copying %s to %s", zoneinfo_file, path_localtime);
else
snprintf(prompt, sizeof(prompt),
"Creating symbolic link %s to %s",
- path_localtime,
- zoneinfo_file == NULL ? "(UTC)" : zoneinfo_file);
+ path_localtime, zoneinfo_file);
if (usedialog)
- dialog_notify(prompt);
+ dialog_msgbox(title, prompt, 8, 72, 1);
else
fprintf(stderr, "%s\n", prompt);
#endif
@@ -699,6 +702,10 @@ install_zoneinfo_file(const char *zonein
return (DITEM_FAILURE | DITEM_RECREATE);
}
+#ifdef VERBOSE
+ snprintf(prompt, sizeof(prompt),
+ "Removed %s", path_localtime);
+#endif
return (DITEM_LEAVE_MENU);
}
@@ -797,23 +804,23 @@ install_zoneinfo_file(const char *zonein
return (DITEM_FAILURE | DITEM_RECREATE);
}
}
- }
#ifdef VERBOSE
- snprintf(title, sizeof(title), "Done");
- if (copymode)
- snprintf(prompt, sizeof(prompt),
- "Copied timezone file from %s to %s", zoneinfo_file,
- path_localtime);
- else
- snprintf(prompt, sizeof(prompt),
- "Created symbolic link from %s to %s", zoneinfo_file,
- path_localtime);
- if (usedialog)
- dialog_msgbox(title, prompt, 8, 72, 1);
- else
- fprintf(stderr, "%s\n", prompt);
+ snprintf(title, sizeof(title), "Done");
+ if (copymode)
+ snprintf(prompt, sizeof(prompt),
+ "Copied timezone file from %s to %s",
+ zoneinfo_file, path_localtime);
+ else
+ snprintf(prompt, sizeof(prompt),
+ "Created symbolic link from %s to %s",
+ zoneinfo_file, path_localtime);
+ if (usedialog)
+ dialog_msgbox(title, prompt, 8, 72, 1);
+ else
+ fprintf(stderr, "%s\n", prompt);
#endif
+ } /* reallydoit */
return (DITEM_LEAVE_MENU);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
