From c6337b7b469ce85996918431f054b19379dcbca1 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Fri, 5 Apr 1996 16:25:38 +0000 Subject: [PATCH] Dynamically sense /etc/wall_cmos_clock presence/absense --- sbin/adjkerntz/adjkerntz.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index 68dbb558aa61..4cc109844416 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -122,18 +122,6 @@ int main(argc, argv) return 1; } - if (init) - wall_clock = (access(_PATH_CLOCK, F_OK) == 0); - else { - mib[0] = CTL_MACHDEP; - mib[1] = CPU_WALLCLOCK; - len = sizeof(wall_clock); - if (sysctl(mib, 2, &wall_clock, &len, NULL, 0) == -1) { - syslog(LOG_ERR, "sysctl(get_wallclock): %m"); - return 1; - } - } - again: (void) sigprocmask(SIG_BLOCK, &mask, NULL); (void) signal(SIGTERM, fake); @@ -143,6 +131,8 @@ int main(argc, argv) stz = NULL; looping = False; + wall_clock = (access(_PATH_CLOCK, F_OK) == 0); + mib[0] = CTL_MACHDEP; mib[1] = CPU_ADJKERNTZ; len = sizeof(kern_offset); @@ -322,14 +312,12 @@ int main(argc, argv) } } - if (init) { - mib[0] = CTL_MACHDEP; - mib[1] = CPU_WALLCLOCK; - len = sizeof(wall_clock); - if (sysctl(mib, 2, NULL, NULL, &wall_clock, len) == -1) { - syslog(LOG_ERR, "sysctl(put_wallclock): %m"); - return 1; - } + mib[0] = CTL_MACHDEP; + mib[1] = CPU_WALLCLOCK; + len = sizeof(wall_clock); + if (sysctl(mib, 2, NULL, NULL, &wall_clock, len) == -1) { + syslog(LOG_ERR, "sysctl(put_wallclock): %m"); + return 1; } if (need_restore) {