[Midnightbsd-cvs] src [11388] trunk/libexec/rpc.rstatd: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 11388
          http://svnweb.midnightbsd.org/src/?rev=11388
Author:   laffer1
Date:     2018-07-06 20:57:33 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/libexec/rpc.rstatd/Makefile
    trunk/libexec/rpc.rstatd/rpc.rstatd.8
    trunk/libexec/rpc.rstatd/rstat_proc.c
    trunk/libexec/rpc.rstatd/rstatd.c

Property Changed:
----------------
    trunk/libexec/rpc.rstatd/rpc.rstatd.8

Modified: trunk/libexec/rpc.rstatd/Makefile
===================================================================
--- trunk/libexec/rpc.rstatd/Makefile	2018-07-07 00:57:14 UTC (rev 11387)
+++ trunk/libexec/rpc.rstatd/Makefile	2018-07-07 00:57:33 UTC (rev 11388)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/libexec/rpc.rstatd/Makefile,v 1.2 2012/04/11 00:46:15 laffer1 Exp $
-# $FreeBSD: src/libexec/rpc.rstatd/Makefile,v 1.8.18.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/rpc.rstatd/Makefile 204352 2010-02-26 09:41:16Z ru $
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c

Modified: trunk/libexec/rpc.rstatd/rpc.rstatd.8
===================================================================
--- trunk/libexec/rpc.rstatd/rpc.rstatd.8	2018-07-07 00:57:14 UTC (rev 11387)
+++ trunk/libexec/rpc.rstatd/rpc.rstatd.8	2018-07-07 00:57:33 UTC (rev 11388)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" -*- nroff -*-
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
@@ -11,11 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -31,8 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/libexec/rpc.rstatd/rpc.rstatd.8,v 1.8.32.1 2008/11/25 02:59:29 kensmith Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/rpc.rstatd/rpc.rstatd.8 262435 2014-02-24 08:21:49Z brueffer $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RSTATD 8


Property changes on: trunk/libexec/rpc.rstatd/rpc.rstatd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/rpc.rstatd/rstat_proc.c
===================================================================
--- trunk/libexec/rpc.rstatd/rstat_proc.c	2018-07-07 00:57:14 UTC (rev 11387)
+++ trunk/libexec/rpc.rstatd/rstat_proc.c	2018-07-07 00:57:33 UTC (rev 11388)
@@ -34,7 +34,7 @@
 static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.25.20.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
+  "$FreeBSD: stable/10/libexec/rpc.rstatd/rstat_proc.c 239991 2012-09-01 14:45:15Z ed $";
 #endif
 
 /*
@@ -245,7 +245,7 @@
 	FETCH_CNT(stats_all.s1.v_pswpout, vm.v_swappgsout);
 	FETCH_CNT(stats_all.s1.v_intr, sys.v_intr);
 	FETCH_CNT(stats_all.s2.v_swtch, sys.v_swtch);
-	gettimeofday(&tm, (struct timezone *) 0);
+	(void)gettimeofday(&tm, NULL);
 	stats_all.s1.v_intr -= hz*(tm.tv_sec - btm.tv_sec) +
 	    hz*(tm.tv_usec - btm.tv_usec)/1000000;
 
@@ -288,8 +288,9 @@
 		stats_all.s1.if_oerrors += ifmd.ifmd_data.ifi_oerrors;
 		stats_all.s1.if_collisions += ifmd.ifmd_data.ifi_collisions;
 	}
-	gettimeofday((struct timeval *)&stats_all.s3.curtime,
-		(struct timezone *) 0);
+	(void)gettimeofday(&tm, NULL);
+	stats_all.s3.curtime.tv_sec = tm.tv_sec;
+	stats_all.s3.curtime.tv_usec = tm.tv_usec;
 	alarm(1);
 }
 

Modified: trunk/libexec/rpc.rstatd/rstatd.c
===================================================================
--- trunk/libexec/rpc.rstatd/rstatd.c	2018-07-07 00:57:14 UTC (rev 11387)
+++ trunk/libexec/rpc.rstatd/rstatd.c	2018-07-07 00:57:33 UTC (rev 11388)
@@ -11,11 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -34,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/libexec/rpc.rstatd/rstatd.c,v 1.11.18.1 2008/11/25 02:59:29 kensmith Exp $";
+  "$FreeBSD: stable/10/libexec/rpc.rstatd/rstatd.c 262435 2014-02-24 08:21:49Z brueffer $";
 #endif /* not lint */
 
 #include <stdlib.h>