svn commit: r301160 - head/bin/ps

Conrad E. Meyer cem at FreeBSD.org
Wed Jun 1 19:54:07 UTC 2016


Author: cem
Date: Wed Jun  1 19:54:05 2016
New Revision: 301160
URL: https://svnweb.freebsd.org/changeset/base/301160

Log:
  ps(1): Expand variables to match expanded fields
  
  ki_flag and ki_tdflag have been 'long', not 'int', since 2000 and 2005,
  respectively.
  
  Submitted by:	Shawn Wills <swills at isilon dot com>
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/bin/ps/keyword.c
  head/bin/ps/print.c

Modified: head/bin/ps/keyword.c
==============================================================================
--- head/bin/ps/keyword.c	Wed Jun  1 19:49:38 2016	(r301159)
+++ head/bin/ps/keyword.c	Wed Jun  1 19:54:05 2016	(r301160)
@@ -95,7 +95,7 @@ static VAR var[] = {
 	{"etimes", "ELAPSED", NULL, "elapsed-times", USER, elapseds, 0, CHAR,
 	    NULL, 0},
 	{"euid", "", "uid", NULL, 0, NULL, 0, CHAR, NULL, 0},
-	{"f", "F", NULL, "flags", 0, kvar, KOFF(ki_flag), INT, "x", 0},
+	{"f", "F", NULL, "flags", 0, kvar, KOFF(ki_flag), LONG, "lx", 0},
 	{"f2", "F2", NULL, "flags2", 0, kvar, KOFF(ki_flag2), INT, "08x", 0},
 	{"fib", "FIB", NULL, "fib", 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
 	{"flags", "", "f", NULL, 0, NULL, 0, CHAR, NULL, 0},

Modified: head/bin/ps/print.c
==============================================================================
--- head/bin/ps/print.c	Wed Jun  1 19:49:38 2016	(r301159)
+++ head/bin/ps/print.c	Wed Jun  1 19:54:05 2016	(r301160)
@@ -211,7 +211,7 @@ logname(KINFO *k, VARENT *ve __unused)
 char *
 state(KINFO *k, VARENT *ve __unused)
 {
-	int flag, tdflags;
+	long flag, tdflags;
 	char *cp, *buf;
 
 	buf = malloc(16);


More information about the svn-src-all mailing list