Author: trociny
Date: Tue Nov 22 21:14:46 2011
New Revision: 227840
URL: http://svn.freebsd.org/changeset/base/227840
Log:
No need in procfs(5).
MFC after: 2 weeks
Modified:
head/bin/ps/ps.1
head/bin/ps/ps.c
Modified: head/bin/ps/ps.1
==============================================================================
--- head/bin/ps/ps.1 Tue Nov 22 21:12:28 2011 (r227839)
+++ head/bin/ps/ps.1 Tue Nov 22 21:14:46 2011 (r227840)
@@ -29,7 +29,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd October 30, 2011
+.Dd November 22, 2011
.Dt PS 1
.Os
.Sh NAME
@@ -686,9 +686,6 @@ attempts to automatically determine the
.Bl -tag -width ".Pa /boot/kernel/kernel" -compact
.It Pa /boot/kernel/kernel
default system namelist
-.It Pa /proc
-the mount point of
-.Xr procfs 5
.El
.Sh SEE ALSO
.Xr kill 1 ,
Modified: head/bin/ps/ps.c
==============================================================================
--- head/bin/ps/ps.c Tue Nov 22 21:12:28 2011 (r227839)
+++ head/bin/ps/ps.c Tue Nov 22 21:14:46 2011 (r227840)
@@ -130,7 +130,6 @@ struct listinfo {
} l;
};
-static int check_procfs(void);
static int addelem_gid(struct listinfo *, const char *);
static int addelem_pid(struct listinfo *, const char *);
static int addelem_tty(struct listinfo *, const char *);
@@ -411,14 +410,6 @@ main(int argc, char *argv[])
argv += optind;
/*
- * If the user specified ps -e then they want a copy of the process
- * environment kvm_getenvv(3) attempts to open /proc/<pid>/mem.
- * Check to make sure that procfs is mounted on /proc, otherwise
- * print a warning informing the user that output will be incomplete.
- */
- if (needenv == 1 && check_procfs() == 0)
- warnx("Process environment requires procfs(5)");
- /*
* If there arguments after processing all the options, attempt
* to treat them as a list of process ids.
*/
@@ -1360,18 +1351,6 @@ kludge_oldps_options(const char *optlist
return (newopts);
}
-static int
-check_procfs(void)
-{
- struct statfs mnt;
-
- if (statfs("/proc", &mnt) < 0)
- return (0);
- if (strcmp(mnt.f_fstypename, "procfs") != 0)
- return (0);
- return (1);
-}
-
static void
usage(void)
{
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
