[Midnightbsd-cvs] src: adjkerntz.c: Switch to getsysctlbyname

[laffer1 at midnightbsd.org]

Log Message:
-----------
Switch to getsysctlbyname

Modified Files:
--------------
    src/sbin/adjkerntz:
        adjkerntz.c (r1.2 -> r1.3)

-------------- next part --------------
Index: adjkerntz.c
===================================================================
RCS file: /home/cvs/src/sbin/adjkerntz/adjkerntz.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sbin/adjkerntz/adjkerntz.c -L sbin/adjkerntz/adjkerntz.c -u -r1.2 -r1.3
--- sbin/adjkerntz/adjkerntz.c
+++ sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,8 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.29 2004/04/27 14:43:03 ghelmer Exp $");
+__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.32 2006/10/23 10:48:19 ru Exp $");
+__MBSDID("$MidnightBSD$");
 
 /*
  * Andrey A. Chernov   <ache at astral.msk.su>    Dec 20 1993
@@ -82,7 +83,6 @@
 	struct timezone tz, *stz;
 	int kern_offset, wall_clock, disrtcset;
 	size_t len;
-	int mib[2];
 	/* Avoid time_t here, can be unsigned long or worse */
 	long offset, localsec, diff;
 	time_t initial_sec, final_sec;
@@ -127,11 +127,11 @@
 
 	(void) signal(SIGHUP, SIG_IGN);
 
-	if (init && daemon(0, 
+	if (init && daemon(0,
 #ifdef DEBUG
-	1
+	    1
 #else
-	0
+	    0
 #endif
 	    )) {
 		syslog(LOG_ERR, "daemon: %m");
@@ -156,11 +156,9 @@
 
 	tzset();
 
-	mib[0] = CTL_MACHDEP;
-	mib[1] = CPU_ADJKERNTZ;
 	len = sizeof(kern_offset);
-	if (sysctl(mib, 2, &kern_offset, &len, NULL, 0) == -1) {
-		syslog(LOG_ERR, "sysctl(get_offset): %m");
+	if (sysctlbyname("machdep.adjkerntz", &kern_offset, &len, NULL, 0) == -1) {
+		syslog(LOG_ERR, "sysctl(\"machdep.adjkerntz\"): %m");
 		return 1;
 	}
 
@@ -292,18 +290,16 @@
 	if (   (init && stv != NULL)
 	    || ((init || !wall_clock) && kern_offset != offset)
 	   ) {
-		mib[0] = CTL_MACHDEP;
-		mib[1] = CPU_DISRTCSET;
 		len = sizeof(disrtcset);
-		if (sysctl(mib, 2, &disrtcset, &len, NULL, 0) == -1) {
-			syslog(LOG_ERR, "sysctl(get_disrtcset): %m");
+		if (sysctlbyname("machdep.disable_rtc_set", &disrtcset, &len, NULL, 0) == -1) {
+			syslog(LOG_ERR, "sysctl(get: \"machdep.disable_rtc_set\"): %m");
 			return 1;
 		}
 		if (disrtcset == 0) {
 			disrtcset = 1;
 			need_restore = True;
-			if (sysctl(mib, 2, NULL, NULL, &disrtcset, len) == -1) {
-				syslog(LOG_ERR, "sysctl(set_disrtcset): %m");
+			if (sysctlbyname("machdep.disable_rtc_set", NULL, NULL, &disrtcset, len) == -1) {
+				syslog(LOG_ERR, "sysctl(set: \"machdep.disable_rtc_set\"): %m");
 				return 1;
 			}
 		}
@@ -333,37 +329,31 @@
 		}
 	}
 
-	/* setting CPU_ADJKERNTZ have a side effect: resettodr(), which */
-	/* can be disabled by CPU_DISRTCSET, so if init or UTC clock    */
+	/* setting machdep.adjkerntz have a side effect: resettodr(), which */
+	/* can be disabled by machdep.disable_rtc_set, so if init or UTC clock    */
 	/* -- don't write RTC, else write RTC.                          */
 
 	if (kern_offset != offset) {
 		kern_offset = offset;
-		mib[0] = CTL_MACHDEP;
-		mib[1] = CPU_ADJKERNTZ;
 		len = sizeof(kern_offset);
-		if (sysctl(mib, 2, NULL, NULL, &kern_offset, len) == -1) {
-			syslog(LOG_ERR, "sysctl(update_offset): %m");
+		if (sysctlbyname("machdep.adjkerntz", NULL, NULL, &kern_offset, len) == -1) {
+			syslog(LOG_ERR, "sysctl(set: \"machdep.adjkerntz\"): %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");
+	if (sysctlbyname("machdep.wall_cmos_clock",  NULL, NULL, &wall_clock, len) == -1) {
+		syslog(LOG_ERR, "sysctl(set: \"machdep.wall_cmos_clock\"): %m");
 		return 1;
 	}
 
 	if (need_restore) {
 		need_restore = False;
-		mib[0] = CTL_MACHDEP;
-		mib[1] = CPU_DISRTCSET;
 		disrtcset = 0;
 		len = sizeof(disrtcset);
-		if (sysctl(mib, 2, NULL, NULL, &disrtcset, len) == -1) {
-			syslog(LOG_ERR, "sysctl(restore_disrtcset): %m");
+		if (sysctlbyname("machdep.disable_rtc_set", NULL, NULL, &disrtcset, len) == -1) {
+			syslog(LOG_ERR, "sysctl(set: \"machdep.disable_rtc_set\"): %m");
 			return 1;
 		}
 	}