D31048.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31048.diff
View Options

	diff --git a/bin/ps/extern.h b/bin/ps/extern.h
	--- a/bin/ps/extern.h
	+++ b/bin/ps/extern.h
	@@ -86,7 +86,7 @@
	char tdnam(KINFO , VARENT *);
	char tname(KINFO , VARENT *);
	char ucomm(KINFO , VARENT *);
	-char uname(KINFO , VARENT *);
	+char username(KINFO , VARENT *);
	char upr(KINFO , VARENT *);
	char usertime(KINFO , VARENT *);
	char vsize(KINFO , VARENT *);
	diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
	--- a/bin/ps/keyword.c
	+++ b/bin/ps/keyword.c
	@@ -222,7 +222,7 @@
	{"upr", "UPR", NULL, "user-priority", 0, upr, 0, CHAR, NULL, 0},
	{"uprocp", "UPROCP", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
	KPTR, "lx", 0},
	- {"user", "USER", NULL, "user", LJUST, uname, 0, CHAR, NULL, 0},
	+ {"user", "USER", NULL, "user", LJUST, username, 0, CHAR, NULL, 0},
	{"usertime", "USERTIME", NULL, "user-time", USER, usertime, 0, CHAR,
	NULL, 0},
	{"usrpri", "", "upr", NULL, 0, NULL, 0, CHAR, NULL, 0},
	diff --git a/bin/ps/print.c b/bin/ps/print.c
	--- a/bin/ps/print.c
	+++ b/bin/ps/print.c
	@@ -311,7 +311,7 @@
	#undef scalepri

	char *
	-uname(KINFO k, VARENT ve __unused)
	+username(KINFO k, VARENT ve __unused)
	{

	return (strdup(user_from_uid(k->ki_p->ki_uid, 0)));