From 57c87bfabb0ab97d12c6dd3589247210c935a085 Mon Sep 17 00:00:00 2001 From: Mikolaj Golub Date: Tue, 22 Nov 2011 21:14:46 +0000 Subject: [PATCH] No need in procfs(5). MFC after: 2 weeks --- bin/ps/ps.1 | 5 +---- bin/ps/ps.c | 21 --------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 1787b400507f..be6035def246 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -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 terminal width. .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 , diff --git a/bin/ps/ps.c b/bin/ps/ps.c index eb2d6301dc7b..2171bc1e5b87 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -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 *); @@ -410,14 +409,6 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - /* - * If the user specified ps -e then they want a copy of the process - * environment kvm_getenvv(3) attempts to open /proc//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, char *origval, const char *nextarg) 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) {