[Midnightbsd-cvs] src [11243] trunk/sbin/adjkerntz/adjkerntz.c: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 1 17:21:45 EDT 2018
Revision: 11243
http://svnweb.midnightbsd.org/src/?rev=11243
Author: laffer1
Date: 2018-07-01 17:21:45 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/sbin/adjkerntz/Makefile
trunk/sbin/adjkerntz/adjkerntz.8
trunk/sbin/adjkerntz/adjkerntz.c
Property Changed:
----------------
trunk/sbin/adjkerntz/adjkerntz.8
Modified: trunk/sbin/adjkerntz/Makefile
===================================================================
--- trunk/sbin/adjkerntz/Makefile 2018-07-01 21:21:19 UTC (rev 11242)
+++ trunk/sbin/adjkerntz/Makefile 2018-07-01 21:21:45 UTC (rev 11243)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sbin/adjkerntz/Makefile,v 1.2 2007/01/02 06:59:59 laffer1 Exp $
-# $FreeBSD: src/sbin/adjkerntz/Makefile,v 1.6 2001/12/04 02:19:43 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/adjkerntz/Makefile 202532 2010-01-17 21:56:27Z ed $
PROG= adjkerntz
MAN= adjkerntz.8
Modified: trunk/sbin/adjkerntz/adjkerntz.8
===================================================================
--- trunk/sbin/adjkerntz/adjkerntz.8 2018-07-01 21:21:19 UTC (rev 11242)
+++ trunk/sbin/adjkerntz/adjkerntz.8 2018-07-01 21:21:45 UTC (rev 11243)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
.\" All rights reserved.
.\"
@@ -22,15 +23,14 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
-.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.29 2005/02/13 22:25:15 ru Exp $
+.\" $FreeBSD: stable/10/sbin/adjkerntz/adjkerntz.8 307403 2016-10-16 22:02:50Z sevan $
.\"
-.Dd April 4, 1996
+.Dd March 8, 2012
.Dt ADJKERNTZ 8
.Os
.Sh NAME
.Nm adjkerntz
-.Nd "adjust local time CMOS clock to reflect time zone changes and keep current timezone offset for the kernel"
+.Nd adjust the local time CMOS clock to reflect time zone changes and keep the current timezone offset for the kernel
.Sh SYNOPSIS
.Nm
.Fl i
@@ -40,23 +40,21 @@
The
.Nm
utility maintains the proper relationship between the kernel clock, which
-is always set to UTC, and the CMOS clock, which may be set to local
-time.
+is always set to UTC and the CMOS clock, which may be set to local time.
The
.Nm
-utility also informs the kernel about machine timezone shifts to
+utility also informs the kernel about machine timezone shifts in order to
maintain proper timestamps for local time file systems such as the MS-DOS
file system.
-The main purpose of this thing is not general fixing of
-initially broken MS-DOS file timestamp idea but keeping
-the same timestamps between
+The main purpose of maintaining these timestamps properly is to keep the
+timestamps of a
.Fx
-MS-DOS file system
-and MS-DOS operating system installed on the same
-machine.
+MS-DOS file system and an MS-DOS operating system synchronized when they are
+installed on the same system rather than fixing broken MS-DOS file
+timestamps.
If the file
.Pa /etc/wall_cmos_clock
-exists, it means that CMOS clock keeps local time (MS-DOS and MS-Windows
+exists, it means that the CMOS clock keeps local time (MS-DOS and MS-Windows
compatible mode).
If that file does not exist, it means that the CMOS clock keeps UTC time.
The
@@ -87,7 +85,7 @@
and sets the kernel clock to the corresponding UTC time.
The
.Nm
-utility also stores the local time zone offset into the
+utility also stores the local time zone offset in the
.Pa machdep.adjkerntz
kernel variable, for use by subsequent invocations of
.Em "'adjkerntz -a'"
@@ -95,7 +93,7 @@
.Pp
For a local time CMOS clock
.Em "'adjkerntz -i'"
-pauses, and remains inactive as a background daemon until it
+pauses and remains inactive as a background daemon until it
receives a SIGTERM.
The SIGTERM will normally be sent by
.Xr init 8
@@ -121,7 +119,7 @@
calculate a new time zone offset.
It stores the new offset into the
.Pa machdep.adjkerntz
-kernel variable, and updates the wall CMOS clock to the new local time.
+kernel variable and updates the wall CMOS clock to the new local time.
If
.Em "'adjkerntz -a'"
was started at a nonexistent time (during a timezone change), it exits
@@ -193,4 +191,4 @@
utility appeared in
.Fx 1.0 .
.Sh AUTHORS
-.An Andrey A. Chernov Aq ache at astral.msk.su
+.An Andrey A. Chernov Aq Mt ache at astral.msk.su
Property changes on: trunk/sbin/adjkerntz/adjkerntz.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/adjkerntz/adjkerntz.c
===================================================================
--- trunk/sbin/adjkerntz/adjkerntz.c 2018-07-01 21:21:19 UTC (rev 11242)
+++ trunk/sbin/adjkerntz/adjkerntz.c 2018-07-01 21:21:45 UTC (rev 11243)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
@@ -32,8 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.32 2006/10/23 10:48:19 ru Exp $");
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/adjkerntz/adjkerntz.c 253750 2013-07-28 18:44:17Z avg $");
/*
* Andrey A. Chernov <ache at astral.msk.su> Dec 20 1993
@@ -316,10 +316,7 @@
* restoring disrtcset, since we don't clean up
* anything.
*/
- if (gettimeofday(&tv, (struct timezone *)NULL)) {
- syslog(LOG_ERR, "gettimeofday: %m");
- return 1;
- }
+ (void)gettimeofday(&tv, NULL);
tv.tv_sec += diff;
stv = &tv;
}
More information about the Midnightbsd-cvs
mailing list