[Midnightbsd-cvs] src: src/bin: better yet lets move it where it default installs to

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Mar 27 18:04:44 EDT 2009


Log Message:
-----------
better yet lets move it where it default installs to

Modified Files:
--------------
    src/bin:
        Makefile (r1.9 -> r1.10)

Added Files:
-----------
    src/bin/pkill:
        Makefile (r1.1)
        pkill.1 (r1.1)
        pkill.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/bin/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L bin/Makefile -L bin/Makefile -u -r1.9 -r1.10
--- bin/Makefile
+++ bin/Makefile
@@ -30,6 +30,7 @@
 	mv \
 	notty \
 	pax \
+	pkill \
 	ps \
 	pwd \
 	${_rcp} \
--- /dev/null
+++ bin/pkill/pkill.c
@@ -0,0 +1,756 @@
+/*	$NetBSD: pkill.c,v 1.16 2005/10/10 22:13:20 kleink Exp $	*/
+/* $MidnightBSD: src/bin/pkill/pkill.c,v 1.1 2009/03/27 22:04:42 laffer1 Exp $ */
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * Copyright (c) 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Doran.
+ *
+ * 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 the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/usr.bin/pkill/pkill.c,v 1.31 2006/11/23 11:55:17 yar Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/user.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <paths.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+#include <regex.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <kvm.h>
+#include <err.h>
+#include <pwd.h>
+#include <grp.h>
+#include <errno.h>
+#include <locale.h>
+
+#define	STATUS_MATCH	0
+#define	STATUS_NOMATCH	1
+#define	STATUS_BADUSAGE	2
+#define	STATUS_ERROR	3
+
+#define	MIN_PID	5
+#define	MAX_PID	99999
+
+/* Ignore system-processes (if '-S' flag is not specified) and myself. */
+#define	PSKIP(kp)	((kp)->ki_pid == mypid ||			\
+			 (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
+
+enum listtype {
+	LT_GENERIC,
+	LT_USER,
+	LT_GROUP,
+	LT_TTY,
+	LT_PGRP,
+	LT_JID,
+	LT_SID
+};
+
+struct list {
+	SLIST_ENTRY(list) li_chain;
+	long	li_number;
+};
+
+SLIST_HEAD(listhead, list);
+
+static struct kinfo_proc *plist;
+static char	*selected;
+static const char *delim = "\n";
+static int	nproc;
+static int	pgrep;
+static int	signum = SIGTERM;
+static int	newest;
+static int	oldest;
+static int	interactive;
+static int	inverse;
+static int	longfmt;
+static int	matchargs;
+static int	fullmatch;
+static int	kthreads;
+static int	cflags = REG_EXTENDED;
+static kvm_t	*kd;
+static pid_t	mypid;
+
+static struct listhead euidlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead sidlist = SLIST_HEAD_INITIALIZER(list);
+static struct listhead jidlist = SLIST_HEAD_INITIALIZER(list);
+
+static void	usage(void) __attribute__((__noreturn__));
+static int	killact(const struct kinfo_proc *);
+static int	grepact(const struct kinfo_proc *);
+static void	makelist(struct listhead *, enum listtype, char *);
+static int	takepid(const char *, int);
+
+int
+main(int argc, char **argv)
+{
+	char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile;
+	const char *execf, *coref;
+	int debug_opt;
+	int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock;
+	size_t jsz;
+	int (*action)(const struct kinfo_proc *);
+	struct kinfo_proc *kp;
+	struct list *li;
+	struct timeval best_tval;
+	regex_t reg;
+	regmatch_t regmatch;
+
+	setlocale(LC_ALL, "");
+
+	if (strcmp(getprogname(), "pgrep") == 0) {
+		action = grepact;
+		pgrep = 1;
+	} else {
+		action = killact;
+		p = argv[1];
+
+		if (argc > 1 && p[0] == '-') {
+			p++;
+			i = (int)strtol(p, &q, 10);
+			if (*q == '\0') {
+				signum = i;
+				argv++;
+				argc--;
+			} else {
+				if (strncasecmp(p, "sig", 3) == 0)
+					p += 3;
+				for (i = 1; i < NSIG; i++)
+					if (strcasecmp(sys_signame[i], p) == 0)
+						break;
+				if (i != NSIG) {
+					signum = i;
+					argv++;
+					argc--;
+				}
+			}
+		}
+	}
+
+	criteria = 0;
+	debug_opt = 0;
+	pidfile = NULL;
+	pidfilelock = 0;
+	execf = coref = _PATH_DEVNULL;
+
+	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:d:fg:ij:lnos:t:u:vx")) != -1)
+		switch (ch) {
+		case 'D':
+			debug_opt++;
+			break;
+		case 'F':
+			pidfile = optarg;
+			criteria = 1;
+			break;
+		case 'G':
+			makelist(&rgidlist, LT_GROUP, optarg);
+			criteria = 1;
+			break;
+		case 'I':
+			if (pgrep)
+				usage();
+			interactive = 1;
+			break;
+		case 'L':
+			pidfilelock = 1;
+			break;
+		case 'M':
+			coref = optarg;
+			break;
+		case 'N':
+			execf = optarg;
+			break;
+		case 'P':
+			makelist(&ppidlist, LT_GENERIC, optarg);
+			criteria = 1;
+			break;
+		case 'S':
+			if (!pgrep)
+				usage();
+			kthreads = 1;
+			break;
+		case 'U':
+			makelist(&ruidlist, LT_USER, optarg);
+			criteria = 1;
+			break;
+		case 'd':
+			if (!pgrep)
+				usage();
+			delim = optarg;
+			break;
+		case 'f':
+			matchargs = 1;
+			break;
+		case 'g':
+			makelist(&pgrplist, LT_PGRP, optarg);
+			criteria = 1;
+			break;
+		case 'i':
+			cflags |= REG_ICASE;
+			break;
+		case 'j':
+			makelist(&jidlist, LT_JID, optarg);
+			criteria = 1;
+			break;
+		case 'l':
+			if (!pgrep)
+				usage();
+			longfmt = 1;
+			break;
+		case 'n':
+			newest = 1;
+			criteria = 1;
+			break;
+		case 'o':
+			oldest = 1;
+			criteria = 1;
+			break;
+		case 's':
+			makelist(&sidlist, LT_SID, optarg);
+			criteria = 1;
+			break;
+		case 't':
+			makelist(&tdevlist, LT_TTY, optarg);
+			criteria = 1;
+			break;
+		case 'u':
+			makelist(&euidlist, LT_USER, optarg);
+			criteria = 1;
+			break;
+		case 'v':
+			inverse = 1;
+			break;
+		case 'x':
+			fullmatch = 1;
+			break;
+		default:
+			usage();
+			/* NOTREACHED */
+		}
+
+	argc -= optind;
+	argv += optind;
+	if (argc != 0)
+		criteria = 1;
+	if (!criteria)
+		usage();
+	if (newest && oldest)
+		errx(STATUS_ERROR, "Options -n and -o are mutually exclusive");
+	if (pidfile != NULL)
+		pidfromfile = takepid(pidfile, pidfilelock);
+	else {
+		if (pidfilelock) {
+			errx(STATUS_ERROR,
+			    "Option -L doesn't make sense without -F");
+		}
+		pidfromfile = -1;
+	}
+
+	mypid = getpid();
+
+	/*
+	 * Retrieve the list of running processes from the kernel.
+	 */
+	kd = kvm_openfiles(execf, coref, NULL, O_RDONLY, buf);
+	if (kd == NULL)
+		errx(STATUS_ERROR, "Cannot open kernel files (%s)", buf);
+
+	/*
+	 * Use KERN_PROC_PROC instead of KERN_PROC_ALL, since we
+	 * just want processes and not individual kernel threads.
+	 */
+	plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
+	if (plist == NULL) {
+		errx(STATUS_ERROR, "Cannot get process list (%s)",
+		    kvm_geterr(kd));
+	}
+
+	/*
+	 * Allocate memory which will be used to keep track of the
+	 * selection.
+	 */
+	if ((selected = malloc(nproc)) == NULL) {
+		err(STATUS_ERROR, "Cannot allocate memory for %d processes",
+		    nproc);
+	}
+	memset(selected, 0, nproc);
+
+	/*
+	 * Refine the selection.
+	 */
+	for (; *argv != NULL; argv++) {
+		if ((rv = regcomp(&reg, *argv, cflags)) != 0) {
+			regerror(rv, &reg, buf, sizeof(buf));
+			errx(STATUS_BADUSAGE,
+			    "Cannot compile regular expression `%s' (%s)",
+			    *argv, buf);
+		}
+
+		for (i = 0, kp = plist; i < nproc; i++, kp++) {
+			if (PSKIP(kp)) {
+				if (debug_opt > 0)
+				    fprintf(stderr, "* Skipped %5d %3d %s\n",
+					kp->ki_pid, kp->ki_uid, kp->ki_comm);
+				continue;
+			}
+
+			if (matchargs &&
+			    (pargv = kvm_getargv(kd, kp, 0)) != NULL) {
+				jsz = 0;
+				while (jsz < sizeof(buf) && *pargv != NULL) {
+					jsz += snprintf(buf + jsz,
+					    sizeof(buf) - jsz,
+					    pargv[1] != NULL ? "%s " : "%s",
+					    pargv[0]);
+					pargv++;
+				}
+				mstr = buf;
+			} else
+				mstr = kp->ki_comm;
+
+			rv = regexec(&reg, mstr, 1, &regmatch, 0);
+			if (rv == 0) {
+				if (fullmatch) {
+					if (regmatch.rm_so == 0 &&
+					    regmatch.rm_eo ==
+					    (off_t)strlen(mstr))
+						selected[i] = 1;
+				} else
+					selected[i] = 1;
+			} else if (rv != REG_NOMATCH) {
+				regerror(rv, &reg, buf, sizeof(buf));
+				errx(STATUS_ERROR,
+				    "Regular expression evaluation error (%s)",
+				    buf);
+			}
+			if (debug_opt > 1) {
+				const char *rv_res = "NoMatch";
+				if (selected[i])
+					rv_res = "Matched";
+				fprintf(stderr, "* %s %5d %3d %s\n", rv_res,
+				    kp->ki_pid, kp->ki_uid, mstr);
+			}
+		}
+
+		regfree(&reg);
+	}
+
+	for (i = 0, kp = plist; i < nproc; i++, kp++) {
+		if (PSKIP(kp))
+			continue;
+
+		if (pidfromfile >= 0 && kp->ki_pid != pidfromfile) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &ruidlist, li_chain)
+			if (kp->ki_ruid == (uid_t)li->li_number)
+				break;
+		if (SLIST_FIRST(&ruidlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &rgidlist, li_chain)
+			if (kp->ki_rgid == (gid_t)li->li_number)
+				break;
+		if (SLIST_FIRST(&rgidlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &euidlist, li_chain)
+			if (kp->ki_uid == (uid_t)li->li_number)
+				break;
+		if (SLIST_FIRST(&euidlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &ppidlist, li_chain)
+			if (kp->ki_ppid == (pid_t)li->li_number)
+				break;
+		if (SLIST_FIRST(&ppidlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &pgrplist, li_chain)
+			if (kp->ki_pgid == (pid_t)li->li_number)
+				break;
+		if (SLIST_FIRST(&pgrplist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &tdevlist, li_chain) {
+			if (li->li_number == -1 &&
+			    (kp->ki_flag & P_CONTROLT) == 0)
+				break;
+			if (kp->ki_tdev == (dev_t)li->li_number)
+				break;
+		}
+		if (SLIST_FIRST(&tdevlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &sidlist, li_chain)
+			if (kp->ki_sid == (pid_t)li->li_number)
+				break;
+		if (SLIST_FIRST(&sidlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		SLIST_FOREACH(li, &jidlist, li_chain) {
+			/* A particular jail ID, including 0 (not in jail) */
+			if (kp->ki_jid == (int)li->li_number)
+				break;
+			/* Any jail */
+			if (kp->ki_jid > 0 && li->li_number == -1)
+				break;
+		}
+		if (SLIST_FIRST(&jidlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
+		if (argc == 0)
+			selected[i] = 1;
+	}
+
+	if (newest || oldest) {
+		best_tval.tv_sec = 0;
+		best_tval.tv_usec = 0;
+		bestidx = -1;
+
+		for (i = 0, kp = plist; i < nproc; i++, kp++) {
+			if (!selected[i])
+				continue;
+			if (bestidx == -1) {
+				/* The first entry of the list which matched. */
+				;
+			} else if (timercmp(&kp->ki_start, &best_tval, >)) {
+				/* This entry is newer than previous "best". */
+				if (oldest)	/* but we want the oldest */
+					continue;
+			} else {
+				/* This entry is older than previous "best". */
+				if (newest)	/* but we want the newest */
+					continue;
+			}
+			/* This entry is better than previous "best" entry. */
+			best_tval.tv_sec = kp->ki_start.tv_sec;
+			best_tval.tv_usec = kp->ki_start.tv_usec;
+			bestidx = i;
+		}
+
+		memset(selected, 0, nproc);
+		if (bestidx != -1)
+			selected[bestidx] = 1;
+	}
+
+	/*
+	 * Take the appropriate action for each matched process, if any.
+	 */
+	for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) {
+		if (PSKIP(kp))
+			continue;
+		if (selected[i]) {
+			if (inverse)
+				continue;
+		} else if (!inverse)
+			continue;
+		rv |= (*action)(kp);
+	}
+
+	exit(rv ? STATUS_MATCH : STATUS_NOMATCH);
+}
+
+static void
+usage(void)
+{
+	const char *ustr;
+
+	if (pgrep)
+		ustr = "[-LSfilnovx] [-d delim]";
+	else
+		ustr = "[-signal] [-ILfinovx]";
+
+	fprintf(stderr,
+		"usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n"
+		"             [-P ppid] [-U uid] [-g pgrp] [-j jid] [-s sid]\n"
+		"             [-t tty] [-u euid] pattern ...\n", getprogname(),
+		ustr);
+
+	exit(STATUS_BADUSAGE);
+}
+
+static void
+show_process(const struct kinfo_proc *kp)
+{
+	char **argv;
+
+	if ((longfmt || !pgrep) && matchargs &&
+	    (argv = kvm_getargv(kd, kp, 0)) != NULL) {
+		printf("%d ", (int)kp->ki_pid);
+		for (; *argv != NULL; argv++) {
+			printf("%s", *argv);
+			if (argv[1] != NULL)
+				putchar(' ');
+		}
+	} else if (longfmt || !pgrep)
+		printf("%d %s", (int)kp->ki_pid, kp->ki_comm);
+	else
+		printf("%d", (int)kp->ki_pid);
+}
+
+static int
+killact(const struct kinfo_proc *kp)
+{
+	int ch, first;
+
+	if (interactive) {
+		/*
+		 * Be careful, ask before killing.
+		 */
+		printf("kill ");
+		show_process(kp);
+		printf("? ");
+		fflush(stdout);
+		first = ch = getchar();
+		while (ch != '\n' && ch != EOF)
+			ch = getchar();
+		if (first != 'y' && first != 'Y')
+			return (1);
+	}
+	if (kill(kp->ki_pid, signum) == -1) {
+		/* 
+		 * Check for ESRCH, which indicates that the process
+		 * disappeared between us matching it and us
+		 * signalling it; don't issue a warning about it.
+		 */
+		if (errno != ESRCH)
+			warn("signalling pid %d", (int)kp->ki_pid);
+		/*
+		 * Return 0 to indicate that the process should not be
+		 * considered a match, since we didn't actually get to
+		 * signal it.
+		 */
+		return (0);
+	}
+	return (1);
+}
+
+static int
+grepact(const struct kinfo_proc *kp)
+{
+
+	show_process(kp);
+	printf("%s", delim);
+	return (1);
+}
+
+static void
+makelist(struct listhead *head, enum listtype type, char *src)
+{
+	struct list *li;
+	struct passwd *pw;
+	struct group *gr;
+	struct stat st;
+	const char *cp, *prefix;
+	char *sp, *ep, buf[MAXPATHLEN];
+	int empty;
+
+	empty = 1;
+	prefix = _PATH_DEV;
+
+	while ((sp = strsep(&src, ",")) != NULL) {
+		if (*sp == '\0')
+			usage();
+
+		if ((li = malloc(sizeof(*li))) == NULL) {
+			err(STATUS_ERROR, "Cannot allocate %zu bytes",
+			    sizeof(*li));
+		}
+
+		SLIST_INSERT_HEAD(head, li, li_chain);
+		empty = 0;
+
+		li->li_number = (uid_t)strtol(sp, &ep, 0);
+		if (*ep == '\0') {
+			switch (type) {
+			case LT_PGRP:
+				if (li->li_number == 0)
+					li->li_number = getpgrp();
+				break;
+			case LT_SID:
+				if (li->li_number == 0)
+					li->li_number = getsid(mypid);
+				break;
+			case LT_JID:
+				if (li->li_number < 0)
+					errx(STATUS_BADUSAGE,
+					     "Negative jail ID `%s'", sp);
+				/* For compatibility with old -j */
+				if (li->li_number == 0)
+					li->li_number = -1;	/* any jail */
+				break;
+			case LT_TTY:
+				usage();
+				/* NOTREACHED */
+			default:
+				break;
+			}
+			continue;
+		}
+
+		switch (type) {
+		case LT_USER:
+			if ((pw = getpwnam(sp)) == NULL)
+				errx(STATUS_BADUSAGE, "Unknown user `%s'", sp);
+			li->li_number = pw->pw_uid;
+			break;
+		case LT_GROUP:
+			if ((gr = getgrnam(sp)) == NULL)
+				errx(STATUS_BADUSAGE, "Unknown group `%s'", sp);
+			li->li_number = gr->gr_gid;
+			break;
+		case LT_TTY:
+			if (strcmp(sp, "-") == 0) {
+				li->li_number = -1;
+				break;
+			} else if (strcmp(sp, "co") == 0) {
+				cp = "console";
+			} else {
+				cp = sp;
+				if (strncmp(sp, "tty", 3) != 0)
+					prefix = _PATH_TTY;
+			}
+
+			snprintf(buf, sizeof(buf), "%s%s", prefix, cp);
+
+			if (stat(buf, &st) == -1) {
+				if (errno == ENOENT) {
+					errx(STATUS_BADUSAGE,
+					    "No such tty: `%s'", sp);
+				}
+				err(STATUS_ERROR, "Cannot access `%s'", sp);
+			}
+
+			if ((st.st_mode & S_IFCHR) == 0)
+				errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp);
+
+			li->li_number = st.st_rdev;
+			break;
+		case LT_JID:
+			if (strcmp(sp, "none") == 0)
+				li->li_number = 0;
+			else if (strcmp(sp, "any") == 0)
+				li->li_number = -1;
+			else if (*ep != '\0')
+				errx(STATUS_BADUSAGE,
+				     "Invalid jail ID `%s'", sp);
+			break;
+		default:
+			usage();
+		}
+	}
+
+	if (empty)
+		usage();
+}
+
+static int
+takepid(const char *pidfile, int pidfilelock)
+{
+	char *endp, line[BUFSIZ];
+	FILE *fh;
+	long rval;
+
+	fh = fopen(pidfile, "r");
+	if (fh == NULL)
+		err(STATUS_ERROR, "Cannot open pidfile `%s'", pidfile);
+
+	if (pidfilelock) {
+		/*
+		 * If we can lock pidfile, this means that daemon is not
+		 * running, so would be better not to kill some random process.
+		 */
+		if (flock(fileno(fh), LOCK_EX | LOCK_NB) == 0) {
+			(void)fclose(fh);
+			errx(STATUS_ERROR, "File '%s' can be locked", pidfile);
+		} else {
+			if (errno != EWOULDBLOCK) {
+				errx(STATUS_ERROR,
+				    "Error while locking file '%s'", pidfile);
+			}
+		}
+	}
+
+	if (fgets(line, sizeof(line), fh) == NULL) {
+		if (feof(fh)) {
+			(void)fclose(fh);
+			errx(STATUS_ERROR, "Pidfile `%s' is empty", pidfile);
+		}
+		(void)fclose(fh);
+		err(STATUS_ERROR, "Cannot read from pid file `%s'", pidfile);
+	}
+	(void)fclose(fh);
+
+	rval = strtol(line, &endp, 10);
+	if (*endp != '\0' && !isspace((unsigned char)*endp))
+		errx(STATUS_ERROR, "Invalid pid in file `%s'", pidfile);
+	else if (rval < MIN_PID || rval > MAX_PID)
+		errx(STATUS_ERROR, "Invalid pid in file `%s'", pidfile);
+	return (rval);
+}
--- /dev/null
+++ bin/pkill/Makefile
@@ -0,0 +1,24 @@
+#	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
+# $FreeBSD: src/usr.bin/pkill/Makefile,v 1.7 2006/08/20 04:25:20 yar Exp $
+# $MidnightBSD: src/bin/pkill/Makefile,v 1.1 2009/03/27 22:04:42 laffer1 Exp $
+
+BINDIR=	/bin
+
+PROG=	pkill
+WARNS?=	5
+
+DPADD=	${LIBKVM}
+LDADD=	-lkvm
+
+LINKS=	${BINDIR}/pkill ${BINDIR}/pgrep
+MLINKS=	pkill.1 pgrep.1
+
+#
+# If considering retirement of these compatibility symlinks,
+# keep in mind that pkill is installed to /usr/bin in other
+# OS types, e.g., NetBSD, OpenBSD, Solaris, and Linux.
+#
+SYMLINKS=	${BINDIR}/pkill /usr/bin/pkill
+SYMLINKS+=	${BINDIR}/pgrep /usr/bin/pgrep
+
+.include <bsd.prog.mk>
--- /dev/null
+++ bin/pkill/pkill.1
@@ -0,0 +1,285 @@
+.\"	$NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
+.\"
+.\" $FreeBSD: src/usr.bin/pkill/pkill.1,v 1.22 2006/12/20 11:57:22 ru Exp $
+.\" $MidnightBSD: src/bin/pkill/pkill.1,v 1.1 2009/03/27 22:04:42 laffer1 Exp $
+.\"
+.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Andrew Doran.
+.\"
+.\" 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 the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd November 23, 2006
+.Dt PKILL 1
+.Os
+.Sh NAME
+.Nm pgrep , pkill
+.Nd find or signal processes by name
+.Sh SYNOPSIS
+.Nm pgrep
+.Op Fl LSfilnovx
+.Op Fl F Ar pidfile
+.Op Fl G Ar gid
+.Op Fl M Ar core
+.Op Fl N Ar system
+.Op Fl P Ar ppid
+.Op Fl U Ar uid
+.Op Fl d Ar delim
+.Op Fl g Ar pgrp
+.Op Fl j Ar jid
+.Op Fl s Ar sid
+.Op Fl t Ar tty
+.Op Fl u Ar euid
+.Ar pattern ...
+.Nm pkill
+.Op Fl Ar signal
+.Op Fl ILfinovx
+.Op Fl F Ar pidfile
+.Op Fl G Ar gid
+.Op Fl M Ar core
+.Op Fl N Ar system
+.Op Fl P Ar ppid
+.Op Fl U Ar uid
+.Op Fl g Ar pgrp
+.Op Fl j Ar jid
+.Op Fl s Ar sid
+.Op Fl t Ar tty
+.Op Fl u Ar euid
+.Ar pattern ...
+.Sh DESCRIPTION
+The
+.Nm pgrep
+command searches the process table on the running system and prints the
+process IDs of all processes that match the criteria given on the command
+line.
+.Pp
+The
+.Nm pkill
+command searches the process table on the running system and signals all
+processes that match the criteria given on the command line.
+.Pp
+The following options are available:
+.Bl -tag -width ".Fl F Ar pidfile"
+.It Fl F Ar pidfile
+Restrict matches to a process whose PID is stored in the
+.Ar pidfile
+file.
+.It Fl G Ar gid
+Restrict matches to processes with a real group ID in the comma-separated
+list
+.Ar gid .
+.It Fl I
+Request confirmation before attempting to signal each process.
+.It Fl L
+The
+.Ar pidfile
+file given for the
+.Fl F
+option must be locked with the
+.Xr flock 2
+syscall or created with
+.Xr pidfile 3 .
+.It Fl M Ar core
+Extract values associated with the name list from the specified core
+instead of the currently running system.
+.It Fl N Ar system
+Extract the name list from the specified system instead of the default,
+which is the kernel image the system has booted from.
+.It Fl P Ar ppid
+Restrict matches to processes with a parent process ID in the
+comma-separated list
+.Ar ppid .
+.It Fl S
+Search also in system processes (kernel threads).
+.It Fl U Ar uid
+Restrict matches to processes with a real user ID in the comma-separated
+list
+.Ar uid .
+.It Fl d Ar delim
+Specify a delimiter to be printed between each process ID.
+The default is a newline.
+This option can only be used with the
+.Nm pgrep
+command.
+.It Fl f
+Match against full argument lists.
+The default is to match against process names.
+.It Fl g Ar pgrp
+Restrict matches to processes with a process group ID in the comma-separated
+list
+.Ar pgrp .
+The value zero is taken to mean the process group ID of the running
+.Nm pgrep
+or
+.Nm pkill
+command.
+.It Fl i
+Ignore case distinctions in both the process table and the supplied pattern.
+.It Fl j Ar jid
+Restrict matches to processes inside jails with a jail ID in the comma-separated
+list
+.Ar jid .
+The value
+.Dq Li any
+matches processes in any jail.
+The value
+.Dq Li none
+matches processes not in jail.
+.It Fl l
+Long output.
+Print the process name in addition to the process ID for each matching
+process.
+If used in conjunction with
+.Fl f ,
+print the process ID and the full argument list for each matching process.
+This option can only be used with the
+.Nm pgrep
+command.
+.It Fl n
+Select only the newest (most recently started) of the matching processes.
+.It Fl o
+Select only the oldest (least recently started) of the matching processes.
+.It Fl s Ar sid
+Restrict matches to processes with a session ID in the comma-separated
+list
+.Ar sid .
+The value zero is taken to mean the session ID of the running
+.Nm pgrep
+or
+.Nm pkill
+command.
+.It Fl t Ar tty
+Restrict matches to processes associated with a terminal in the
+comma-separated list
+.Ar tty .
+Terminal names may be of the form
+.Pa tty Ns Ar xx
+or the shortened form
+.Ar xx .
+A single dash
+.Pq Ql -
+matches processes not associated with a terminal.
+.It Fl u Ar euid
+Restrict matches to processes with an effective user ID in the
+comma-separated list
+.Ar euid .
+.It Fl v
+Reverse the sense of the matching; display processes that do not match the
+given criteria.
+.It Fl x
+Require an exact match of the process name, or argument list if
+.Fl f
+is given.
+The default is to match any substring.
+.It Fl Ns Ar signal
+A non-negative decimal number or symbolic signal name specifying the signal
+to be sent instead of the default
+.Dv TERM .
+This option is valid only when given as the first argument to
+.Nm pkill .
+.El
+.Pp
+If any
+.Ar pattern
+operands are specified, they are used as regular expressions to match
+the command name or full argument list of each process.
+If the
+.Fl f
+option is not specified, then the
+.Ar pattern
+will attempt to match the command name.
+However, presently
+.Fx
+will only keep track of the first 19 characters of the command
+name for each process.
+Attempts to match any characters after the first 19 of a command name
+will quietly fail.
+.Pp
+Note that a running
+.Nm pgrep
+or
+.Nm pkill
+process will never consider itself nor system processes (kernel threads) as
+a potential match.
+.Sh EXIT STATUS
+The
+.Nm pgrep
+and
+.Nm pkill
+utilities
+return one of the following values upon exit:
+.Bl -tag -width indent
+.It 0
+One or more processes were matched.
+.It 1
+No processes were matched.
+.It 2
+Invalid options were specified on the command line.
+.It 3
+An internal error occurred.
+.El
+.Sh COMPATIBILITY
+Historically the option
+.Dq Fl j Li 0
+means any jail, although in other utilities such as
+.Xr ps 1
+jail ID
+.Li 0
+has the opposite meaning, not in jail.
+Therefore
+.Dq Fl j Li 0
+is deprecated, and its use is discouraged in favor of
+.Dq Fl j Li any .
+.Sh SEE ALSO
+.Xr kill 1 ,
+.Xr killall 1 ,
+.Xr ps 1 ,
+.Xr flock 2 ,
+.Xr kill 2 ,
+.Xr sigaction 2 ,
+.Xr pidfile 3 ,
+.Xr re_format 7
+.\" Xr signal 7
+.Sh HISTORY
+The
+.Nm pkill
+and
+.Nm pgrep
+utilities
+first appeared in
+.Nx 1.6 .
+They are modelled after utilities of the same name that appeared in Sun
+Solaris 7.
+They made their first appearance in
+.Fx 5.3 .
+.Sh AUTHORS
+.An Andrew Doran
+.Aq ad at NetBSD.org


More information about the Midnightbsd-cvs mailing list