svn commit: r227840 - head/bin/ps

[Mikolaj Golub]

On Tue, 22 Nov 2011 21:24:13 +0000 Alexander Best wrote:

 AB> On Tue Nov 22 11, Mikolaj Golub wrote:
 >> 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

 AB> are these references to procfs still necessary in the ps(1) man page?

 AB> 1)
 AB> "
 AB>      The process file system (see procfs(5)) should be mounted when ps is exe-
 AB>      cuted, otherwise not all information will be available.
 AB> "

Thanks, I will remove this.

 AB> and 2)

 AB> "
 AB> SEE ALSO
 AB>      kill(1), pgrep(1), pkill(1), procstat(1), w(1), kvm(3), strftime(3),
 AB>      mac(4), procfs(5), pstat(8), sysctl(8), mutex(9)
 AB> "

 AB> ?

I think this reference to procfs(5) should remain. It is here as yet another
way to get process statistics.

 >>  .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)
 >>  {

-- 
Mikolaj Golub