diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 51dbd478edf1..8b62892f8cd6 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20170927: procctl +OLD_FILES+=usr/share/man/man8/procctl.8.gz +OLD_FILES+=usr/sbin/procctl # 20170926: remove unneeded man aliases and locales directory OLD_FILES+=usr/share/man/en.ISO8859-1/man1 OLD_FILES+=usr/share/man/en.ISO8859-1/man2 diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5 index cea1505f2b75..8532762a154e 100644 --- a/share/man/man5/procfs.5 +++ b/share/man/man5/procfs.5 @@ -196,7 +196,6 @@ file system on .Xr mount 2 , .Xr sigaction 2 , .Xr unmount 2 , -.Xr procctl 8 , .Xr pseudofs 9 .Sh AUTHORS .An -nosplit diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index 4fc4b07daa63..8b810f2d94b6 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -708,7 +708,6 @@ DIRDEPS+= \ usr.sbin/pppctl \ usr.sbin/praliases \ usr.sbin/praudit \ - usr.sbin/procctl \ usr.sbin/prometheus_sysctl_exporter \ usr.sbin/pstat \ usr.sbin/pw \ diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index cb7aabc5be37..a8eaa9f9c6ac 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -61,7 +61,6 @@ SUBDIR= adduser \ pciconf \ periodic \ powerd \ - procctl \ prometheus_sysctl_exporter \ pstat \ pw \ diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile deleted file mode 100644 index 880b93a13fe0..000000000000 --- a/usr.sbin/procctl/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -PROG= procctl -MAN= procctl.8 - -.include diff --git a/usr.sbin/procctl/Makefile.depend b/usr.sbin/procctl/Makefile.depend deleted file mode 100644 index 3646e2e2b1af..000000000000 --- a/usr.sbin/procctl/Makefile.depend +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libgcc \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/usr.sbin/procctl/procctl.8 b/usr.sbin/procctl/procctl.8 deleted file mode 100644 index 1add286472f4..000000000000 --- a/usr.sbin/procctl/procctl.8 +++ /dev/null @@ -1,34 +0,0 @@ -.\" $FreeBSD$ -.Dd November 23, 1997 -.Dt PROCCTL 8 -.Os -.Sh NAME -.Nm procctl -.Nd clear procfs event flags -.Sh SYNOPSIS -.Nm -.Ar pid ... -.Sh DESCRIPTION -The -.Nm -utility clears the -.Xr procfs 5 -event mask used by -.Xr truss 1 . -This can be used in the event that a process is left stranded, since -the -.Xr procfs 5 -events result in a non-killable process. -The arguments are a list of process IDs; -.Nm -goes through the list and clears the event masks for each specified process. -.Sh SEE ALSO -.Xr truss 1 , -.Xr procfs 5 -.Sh HISTORY -The -.Nm -utility was written by -.An Sean Eric Fagan -for -.Fx . diff --git a/usr.sbin/procctl/procctl.c b/usr.sbin/procctl/procctl.c deleted file mode 100644 index 5bd1f21954c6..000000000000 --- a/usr.sbin/procctl/procctl.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 1997 Sean Eric Fagan - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Sean Eric Fagan - * 4. Neither the name of the author may be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include -__FBSDID("$FreeBSD$"); - -/* - * procctl -- clear the event mask, and continue, any specified processes. - * This is largely an example of how to use the procfs interface; however, - * for now, it is also sometimes necessary, as a stopped process will not - * otherwise continue. (This will be fixed in a later version of the - * procfs code, almost certainly; however, this program will still be useful - * for some annoying circumstances.) - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int -main(int ac, char **av) { - int fd; - int i; - - for (i = 1; i < ac; i++) { - char buf[32]; - - snprintf(buf, sizeof(buf), "/proc/%s/mem", av[i]); - fd = open(buf, O_RDWR); - if (fd == -1) { - if (errno == ENOENT) - continue; - warn("cannot open pid %s", av[i]); - continue; - } - if (ioctl(fd, PIOCBIC, ~0) == -1) - warn("cannot clear process %s's event mask", av[i]); - if (ioctl(fd, PIOCCONT, 0) == -1 && errno != EINVAL) - warn("cannot continue process %s", av[i]); - close(fd); - } - return 0; -}