[Midnightbsd-cvs] src [10360] trunk/usr.sbin/pstat/pstat.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10360
          http://svnweb.midnightbsd.org/src/?rev=10360
Author:   laffer1
Date:     2018-06-03 19:02:55 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/pstat/Makefile
    trunk/usr.sbin/pstat/pstat.8
    trunk/usr.sbin/pstat/pstat.c

Property Changed:
----------------
    trunk/usr.sbin/pstat/pstat.8

Modified: trunk/usr.sbin/pstat/Makefile
===================================================================
--- trunk/usr.sbin/pstat/Makefile	2018-06-03 23:02:23 UTC (rev 10359)
+++ trunk/usr.sbin/pstat/Makefile	2018-06-03 23:02:55 UTC (rev 10360)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/pstat/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 PROG=	pstat
 LINKS=	${BINDIR}/pstat ${BINDIR}/swapinfo

Modified: trunk/usr.sbin/pstat/pstat.8
===================================================================
--- trunk/usr.sbin/pstat/pstat.8	2018-06-03 23:02:23 UTC (rev 10359)
+++ trunk/usr.sbin/pstat/pstat.8	2018-06-03 23:02:55 UTC (rev 10360)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
 .\" Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -33,9 +34,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/pstat/pstat.8 276622 2015-01-03 15:37:34Z jilles $
 .\"
-.Dd August 20, 2008
+.Dd October 11, 2014
 .Dt PSTAT 8
 .Os
 .Sh NAME
@@ -170,7 +171,7 @@
 .It COL
 Calculated column position of terminal.
 .It SESS
-Kernel address of the session structure.
+Process ID of the session leader.
 .It PGID
 Process group for which this is the controlling terminal.
 .It STATE


Property changes on: trunk/usr.sbin/pstat/pstat.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/pstat/pstat.c
===================================================================
--- trunk/usr.sbin/pstat/pstat.c	2018-06-03 23:02:23 UTC (rev 10359)
+++ trunk/usr.sbin/pstat/pstat.c	2018-06-03 23:02:55 UTC (rev 10360)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -46,7 +47,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/pstat/pstat.c 311753 2017-01-09 05:58:48Z delphij $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -174,8 +175,6 @@
 		default:
 			usage();
 		}
-	argc -= optind;
-	argv += optind;
 
 	/*
 	 * Initialize symbol names list.
@@ -339,13 +338,13 @@
 ttyprt(struct xtty *xt)
 {
 	int i, j;
-	char *name;
+	const char *name;
 
 	if (xt->xt_size != sizeof *xt)
 		errx(1, "struct xtty size mismatch");
 	if (usenumflag || xt->xt_dev == 0 ||
 	   (name = devname(xt->xt_dev, S_IFCHR)) == NULL)
-		printf("%5d,%4d ", major(xt->xt_dev), minor(xt->xt_dev));
+		printf("%#10jx ", (uintmax_t)xt->xt_dev);
 	else
 		printf("%10s ", name);
 	printf("%5zu %4zu %4zu %4zu %5zu %4zu %4zu %5u %5d %5d ",