cvs commit: src/usr.bin/pkill pkill.1 pkill.c src/tools/regression/usr.bin/pkill pgrep-j.t pkill-j.t

[Yar Tikhiy]

yar         2006-11-23 11:55:17 UTC

  FreeBSD src repository

  Modified files:
    usr.bin/pkill        pkill.1 pkill.c 
    tools/regression/usr.bin/pkill pgrep-j.t pkill-j.t 
  Log:
  Fix and extend the -j option to pkill/pgrep WRT the jail
  wildcard specifications.  Earlier the only wildcard syntax
  was "-j 0" for "any jail".  There were at least
  two shortcomings in it:  First, jail ID 0 was abused; it
  meant "no jail" in other utils, e.g., ps(1).  Second, it
  was impossible to match processed not in jail, which could
  be useful to rc.d developers.  Therefore a new syntax is
  introduced: "-j any" means any jail while "-j none" means
  out of jail.  The old syntax is preserved for compatibility,
  but now it's deprecated because it's limited and confusing.
  
  Update the respective regression tests.  While I'm here,
  make the tests more complex but sensitive:  Start several
  processes, some in jail and some out of jail, so we can
  detect that only the right processes are killed by pkill
  or matched by pgrep.
  
  Reviewed by:    gad, pjd
  MFC after:      1 week
  
  Revision  Changes    Path
  1.2       +41 -11    src/tools/regression/usr.bin/pkill/pgrep-j.t
  1.2       +46 -24    src/tools/regression/usr.bin/pkill/pkill-j.t
  1.21      +19 -2     src/usr.bin/pkill/pkill.1
  1.31      +25 -7     src/usr.bin/pkill/pkill.c