PSARC 2009/076 Unified ps(1)

6802708 /usr/bin/ps should work with SysV and ucb arguments
6610013 ps -Z headers don't line up

--HG--
rename : usr/src/ucbcmd/ps/ps.c => usr/src/cmd/ps/ucbps.c

13 files changed, 92 insertions, 370 deletions

diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index e4525d3322..5177c5b8a2 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -213,6 +213,10 @@ i386_ROOT.BIN= \
 sparc_ROOT.BIN= \
 	/usr/lib/ldoms
 
+sparc_64ONLY= $(POUND_SIGN)
+64ONLY=  $($(MACH)_64ONLY)
+
+$(64ONLY) MACH32_ROOT.UCB=/usr/ucb/$(MACH32)
 ROOT.BIN= \
 	$($(MACH)_ROOT.BIN) \
 	/etc/dbus-1 \
@@ -323,7 +327,7 @@ ROOT.BIN= \
 	/usr/share/man \
 	/usr/share/man/man1m \
 	/usr/ucb \
-	/usr/ucb/$(MACH32) \
+	$(MACH32_ROOT.UCB) \
 	/usr/ucblib \
 	/usr/xpg4 \
 	/usr/xpg4/bin \
diff --git a/usr/src/cmd/ps/Makefile b/usr/src/cmd/ps/Makefile
index 4025d4891c..d1b61c7874 100644
--- a/usr/src/cmd/ps/Makefile
+++ b/usr/src/cmd/ps/Makefile
@@ -18,16 +18,15 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # cmd/ps/Makefile
 #
 
 PROG= ps
+OBJS=ps.o ucbps.o
+SRCS=$(OBJS:%.o=%.c)
 
 include ../Makefile.cmd
 
@@ -35,6 +34,10 @@ XGETFLAGS += -a -x ps.xcl
 
 DCFILE= $(PROG).dc
 
+ROOTUCBPROG = $(ROOT)/usr/ucb/$(PROG)
+ROOTUCBPROG32 = $(ROOT)/usr/ucb/$(MACH32)/$(PROG)
+ROOTUCBPROG64 = $(ROOT)/usr/ucb/$(MACH64)/$(PROG)
+
 $(64ONLY)SUBDIRS= $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
@@ -53,6 +56,12 @@ clean clobber lint:	$(SUBDIRS)
 install:	$(SUBDIRS)
 	-$(RM) $(ROOTPROG)
 	-$(LN) $(ISAEXEC) $(ROOTPROG)
+	-$(RM) $(ROOTUCBPROG)
+	-$(LN) $(ISAEXEC) $(ROOTUCBPROG)
+	$(64ONLY)-$(RM) $(ROOTUCBPROG32)
+	$(64ONLY)-$(LN) $(ROOTPROG32) $(ROOTUCBPROG32)
+	$(BUILD64)-$(RM) $(ROOTUCBPROG64)
+	$(BUILD64)-$(LN) $(ROOTPROG64) $(ROOTUCBPROG64)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/ps/Makefile.com b/usr/src/cmd/ps/Makefile.com
index b3ab49844f..aa7a2bec45 100644
--- a/usr/src/cmd/ps/Makefile.com
+++ b/usr/src/cmd/ps/Makefile.com
@@ -19,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/ps/Makefile.com
 #
 
 PROG=	ps
 
-OBJS=	ps.o
+OBJS=	ps.o ucbps.o
 
 SRCS=	$(OBJS:%.o=../%.c)
 
diff --git a/usr/src/cmd/ps/ps.c b/usr/src/cmd/ps/ps.c
index 718b6a1540..757785882b 100644
--- a/usr/src/cmd/ps/ps.c
+++ b/usr/src/cmd/ps/ps.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -292,6 +292,8 @@ static size_t	lpbufsize;
  */
 #define	PTHRESHOLD	40
 
+#define	UCB_OPTS	"-aceglnrtuvwxSU"
+
 static	void	usage(void);
 static	char	*getarg(char **);
 static	char	*parse_format(char *);
@@ -320,9 +322,48 @@ static	int	str2uid(const char *,  uid_t *, unsigned long, unsigned long);
 static	void	*Realloc(void *, size_t);
 static	int	pidcmp(const void *p1, const void *p2);
 
+extern	int	ucbmain(int, char **);
+static	int	stdmain(int, char **);
+
 int
 main(int argc, char **argv)
 {
+	const char *me;
+
+	/*
+	 * The original two ps'es are linked in a single binary;
+	 * their main()s are renamed to stdmain for /usr/bin/ps and
+	 * ucbmain for /usr/ucb/ps.
+	 * We try to figure out which instance of ps the user wants to run.
+	 * Traditionally, the UCB variant doesn't require the flag argument
+	 * start with a "-".  If the first argument doesn't start with a
+	 * "-", we call "ucbmain".
+	 * If there's a first argument and it starts with a "-", we check
+	 * whether any of the options isn't acceptable to "ucbmain"; in that
+	 * case we run "stdmain".
+	 * If we can't tell from the options which main to call, we check
+	 * the binary we are running.  We default to "stdmain" but
+	 * any mention in the executable name of "ucb" causes us to call
+	 * ucbmain.
+	 */
+	if (argv[1] != NULL) {
+		if (argv[1][0] != '-')
+			return (ucbmain(argc, argv));
+		else if (argv[1][strspn(argv[1], UCB_OPTS)] != '\0')
+			return (stdmain(argc, argv));
+	}
+
+	me = getexecname();
+
+	if (me != NULL && strstr(me, "ucb") != NULL)
+		return (ucbmain(argc, argv));
+	else
+		return (stdmain(argc, argv));
+}
+
+static int
+stdmain(int argc, char **argv)
+{
 	char	*p;
 	char	*p1;
 	char	*parg;
@@ -773,22 +814,24 @@ main(int argc, char **argv)
 			(void) printf("\n");
 		}
 	} else {	/* print standard header */
+		/*
+		 * All fields before 'PID' are printed with a trailing space
+		 * as a separator and that is how we print the headers too.
+		 */
 		if (lflg) {
 			if (yflg)
-				(void) printf(" S");
+				(void) printf("S ");
 			else
-				(void) printf(" F S");
+				(void) printf(" F S ");
 		}
 		if (Zflg)
-			(void) printf("    ZONE");
+			(void) printf("    ZONE ");
 		if (fflg) {
-			if (lflg)
-				(void) printf(" ");
-			(void) printf("     UID");
+			(void) printf("     UID ");
 		} else if (lflg)
-			(void) printf("    UID");
+			(void) printf("   UID ");
 
-		(void) printf(" %*s", pidwidth,  "PID");
+		(void) printf("%*s", pidwidth,  "PID");
 		if (lflg || fflg)
 			(void) printf(" %*s", pidwidth, "PPID");
 		if (jflg)
@@ -1302,7 +1345,7 @@ prcom(psinfo_t *psinfo, char *ttyp)
 
 	/*
 	 * All fields before 'PID' are printed with a trailing space as a
-	 * spearator, rather than keeping track of which column is first.  All
+	 * separator, rather than keeping track of which column is first.  All
 	 * other fields are printed with a leading space.
 	 */
 	if (lflg) {
@@ -1314,7 +1357,7 @@ prcom(psinfo_t *psinfo, char *ttyp)
 	if (Zflg) {						/* ZONE */
 		if (getzonenamebyid(psinfo->pr_zoneid, zonename,
 		    sizeof (zonename)) < 0) {
-			(void) printf("%7.7d ", ((int)psinfo->pr_zoneid));
+			(void) printf(" %7.7d ", ((int)psinfo->pr_zoneid));
 		} else {
 			(void) printf("%8.8s ", zonename);
 		}
@@ -1324,7 +1367,7 @@ prcom(psinfo_t *psinfo, char *ttyp)
 		if ((pwd = getpwuid(psinfo->pr_euid)) != NULL)
 			(void) printf("%8.8s ", pwd->pw_name);
 		else
-			(void) printf("%7.7u ", psinfo->pr_euid);
+			(void) printf(" %7.7u ", psinfo->pr_euid);
 	} else if (lflg) {
 		(void) printf("%6u ", psinfo->pr_euid);
 	}
@@ -2095,7 +2138,7 @@ przom(psinfo_t *psinfo)
 	if (Zflg) {
 		if (getzonenamebyid(psinfo->pr_zoneid, zonename,
 		    sizeof (zonename)) < 0) {
-			(void) printf("%7.7d ", ((int)psinfo->pr_zoneid));
+			(void) printf(" %7.7d ", ((int)psinfo->pr_zoneid));
 		} else {
 			(void) printf("%8.8s ", zonename);
 		}
diff --git a/usr/src/ucbcmd/ps/ps.c b/usr/src/cmd/ps/ucbps.c
index 598a4edea4..4731f260e9 100644
--- a/usr/src/ucbcmd/ps/ps.c
+++ b/usr/src/cmd/ps/ucbps.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,8 +36,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ps -- print things about processes.
  */
@@ -144,7 +141,7 @@ static	char	*err_string(int);
 extern int	scrwidth(wchar_t);	/* header file? */
 
 int
-main(int argc, char **argv)
+ucbmain(int argc, char **argv)
 {
 	psinfo_t info;		/* process information structure from /proc */
 	char *psargs = NULL;	/* pointer to buffer for -w and -ww options */
@@ -496,7 +493,7 @@ retry:
 		if (nent >= entsize) {
 			entsize *= 2;
 			psent = (struct psent *)realloc((char *)psent,
-				entsize * sizeof (struct psent));
+			    entsize * sizeof (struct psent));
 			if (psent == NULL) {
 				(void) fprintf(stderr, "ps: no memory\n");
 				exit(1);
@@ -946,7 +943,7 @@ prcom(int found, psinfo_t *psinfo, char *psargs)
 			(void) printf("         ");
 		} else if (psinfo->pr_lwp.pr_wchan) {
 			(void) printf(" %+8.8lx",
-				(ulong_t)psinfo->pr_lwp.pr_wchan);
+			    (ulong_t)psinfo->pr_lwp.pr_wchan);
 		} else {
 			(void) printf("        ?");
 		}
@@ -1046,10 +1043,10 @@ prtime(timestruc_t st)
 	starttime = st.tv_sec;
 	if (tim - starttime > 24*60*60) {
 		(void) strftime(sttim, sizeof (sttim), "%b %d",
-						localtime(&starttime));
+		    localtime(&starttime));
 	} else {
 		(void) strftime(sttim, sizeof (sttim), "%H:%M:%S",
-						localtime(&starttime));
+		    localtime(&starttime));
 	}
 	(void) printf("%9.9s", sttim);
 }
diff --git a/usr/src/pkgdefs/SUNWscpu/prototype_i386 b/usr/src/pkgdefs/SUNWscpu/prototype_i386
index 66177ea035..9a31ce3582 100644
--- a/usr/src/pkgdefs/SUNWscpu/prototype_i386
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_i386
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
 # and their location on the development machine when building the package.
@@ -49,9 +47,9 @@
 # SUNWscpu
 #
 d none usr/ucb/i86 755 root bin
-f none usr/ucb/i86/ps 0555 root sys
+l none usr/ucb/i86/ps=../../bin/i86/ps
 d none usr/ucb/amd64 755 root bin
-f none usr/ucb/amd64/ps 0555 root sys
+l none usr/ucb/amd64/ps=../../bin/amd64/ps
 d none usr/ucblib/amd64 755 root bin
 s none usr/ucblib/64=amd64
 s none usr/ucblib/amd64/libcurses.so=./libcurses.so.1
diff --git a/usr/src/pkgdefs/SUNWscpu/prototype_sparc b/usr/src/pkgdefs/SUNWscpu/prototype_sparc
index 89167ef702..d693b4af3a 100644
--- a/usr/src/pkgdefs/SUNWscpu/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_sparc
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
 # and their location on the development machine when building the package.
@@ -48,10 +46,8 @@
 #
 # SUNWscpu
 #
-d none usr/ucb/sparcv7 755 root bin
-f none usr/ucb/sparcv7/ps 0555 root sys
 d none usr/ucb/sparcv9 755 root bin
-f none usr/ucb/sparcv9/ps 0555 root sys
+l none usr/ucb/sparcv9/ps=../../bin/sparcv9/ps
 d none usr/ucblib/sparcv9 755 root bin
 s none usr/ucblib/64=sparcv9
 s none usr/ucblib/sparcv9/libcurses.so=./libcurses.so.1
diff --git a/usr/src/ucbcmd/Makefile b/usr/src/ucbcmd/Makefile
index ca06de2aa9..c3372038a2 100644
--- a/usr/src/ucbcmd/Makefile
+++ b/usr/src/ucbcmd/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 1989-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ucbcmd/Makefile
@@ -55,7 +51,6 @@ COMMON_SUBDIRS=		\
 	mkstr		\
 	plot		\
 	printenv	\
-	ps		\
 	rusage		\
 	sed		\
 	shutdown	\
diff --git a/usr/src/ucbcmd/ps/Makefile b/usr/src/ucbcmd/ps/Makefile
deleted file mode 100644
index ed11e38c31..0000000000
--- a/usr/src/ucbcmd/ps/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1989-1998 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# ucbcmd/ps/Makefile
-#
-
-PROG= ps
-
-include ../Makefile.ucbcmd
-
-SUBDIRS=	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
-
-all	:=	TARGET = all
-install	:=	TARGET = install
-clean	:=	TARGET = clean
-clobber	:=	TARGET = clobber
-lint	:=	TARGET = lint
-
-.KEEP_STATE:
-
-all:	$(SUBDIRS)
-
-clean clobber lint:	$(SUBDIRS)
-
-install:	$(SUBDIRS)
-	-$(RM) $(ROOTPROG)
-	-$(LN) $(ISAEXEC) $(ROOTPROG)
-
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
-
-include ../Makefile.ucbtarg
diff --git a/usr/src/ucbcmd/ps/amd64/Makefile b/usr/src/ucbcmd/ps/amd64/Makefile
deleted file mode 100644
index f5836825b8..0000000000
--- a/usr/src/ucbcmd/ps/amd64/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-PROG=	ps
-
-OBJS=	ps.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.ucbcmd
-include ../../Makefile.ucbcmd.64
-
-CFLAGS64	+= $(CCVERBOSE)
-
-FILEMODE= 0555
-OWNER= root
-GROUP= sys
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTPROG64)
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.ucbtarg
diff --git a/usr/src/ucbcmd/ps/i386/Makefile b/usr/src/ucbcmd/ps/i386/Makefile
deleted file mode 100644
index 2cb47ec7a7..0000000000
--- a/usr/src/ucbcmd/ps/i386/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ucbcmd/ps/i386/Makefile
-#
-
-PROG=	ps
-
-OBJS=	ps.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.ucbcmd
-
-CFLAGS	+= $(CCVERBOSE)
-
-lint	:= LINTFLAGS = -x
-
-FILEMODE= 0555
-OWNER= root
-GROUP= sys
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTPROG32)
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.ucbtarg
diff --git a/usr/src/ucbcmd/ps/sparc/Makefile b/usr/src/ucbcmd/ps/sparc/Makefile
deleted file mode 100644
index 57b893c195..0000000000
--- a/usr/src/ucbcmd/ps/sparc/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ucbcmd/ps/sparc/Makefile
-#
-
-PROG=	ps
-
-OBJS=	ps.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.ucbcmd
-
-CFLAGS	+= $(CCVERBOSE)
-
-lint	:= LINTFLAGS = -x
-
-FILEMODE= 0555
-OWNER= root
-GROUP= sys
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTPROG32)
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.ucbtarg
diff --git a/usr/src/ucbcmd/ps/sparcv9/Makefile b/usr/src/ucbcmd/ps/sparcv9/Makefile
deleted file mode 100644
index f95c42e6db..0000000000
--- a/usr/src/ucbcmd/ps/sparcv9/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ucbcmd/ps/sparcv9/Makefile
-#
-
-PROG=	ps
-
-OBJS=	ps.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.ucbcmd
-include ../../Makefile.ucbcmd.64
-
-CFLAGS64	+= $(CCVERBOSE)
-
-lint	:= LINTFLAGS64 = -x -m64
-
-FILEMODE= 0555
-OWNER= root
-GROUP= sys
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTPROG64)
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.ucbtarg