Attachment 159627 Details for Bug 201588 – patch, v2

[patch] patch, v2

pkill-v2.diff (text/plain), 5.65 KB, created by danielsh on 2015-08-06 20:02:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: danielsh

Created: 2015-08-06 20:02:17 UTC

Size: 5.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 285594)
>+++ Makefile	(working copy)
>@@ -5,7 +5,7 @@
> 
> PROG=	pkill
> 
>-LIBADD=	kvm
>+LIBADD=	kvm jail
> 
> LINKS=	${BINDIR}/pkill ${BINDIR}/pgrep
> MLINKS=	pkill.1 pgrep.1
>Index: Makefile.depend
>===================================================================
>--- Makefile.depend	(revision 285594)
>+++ Makefile.depend	(working copy)
>@@ -9,6 +9,7 @@ DIRDEPS = \
> 	lib/${CSU_DIR} \
> 	lib/libc \
> 	lib/libcompiler_rt \
>+	lib/libjail \
> 	lib/libkvm \
> 
> 
>Index: pkill.1
>===================================================================
>--- pkill.1	(revision 285594)
>+++ pkill.1	(working copy)
>@@ -47,7 +47,7 @@
> .Op Fl c Ar class
> .Op Fl d Ar delim
> .Op Fl g Ar pgrp
>-.Op Fl j Ar jid
>+.Op Fl j Ar jail
> .Op Fl s Ar sid
> .Op Fl t Ar tty
> .Op Fl u Ar euid
>@@ -63,7 +63,7 @@
> .Op Fl U Ar uid
> .Op Fl c Ar class
> .Op Fl g Ar pgrp
>-.Op Fl j Ar jid
>+.Op Fl j Ar jail
> .Op Fl s Ar sid
> .Op Fl t Ar tty
> .Op Fl u Ar euid
>@@ -149,16 +149,17 @@ or
> 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
>+.It Fl j Ar jail
>+Restrict matches to processes inside the specified jails.
>+The argument
>+.Ar jail
>+may be
> .Dq Li any
>-matches processes in any jail.
>-The value
>+to match processes in any jail,
> .Dq Li none
>-matches processes not in jail.
>+to match processes not in jail,
>+or
>+a comma-separated list of jail IDs or names.
> .It Fl l
> Long output.
> For
>Index: pkill.c
>===================================================================
>--- pkill.c	(revision 285594)
>+++ pkill.c	(working copy)
>@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
> #include <sys/stat.h>
> #include <sys/time.h>
> #include <sys/user.h>
>+#include <sys/jail.h>
> 
> #include <assert.h>
> #include <stdio.h>
>@@ -59,6 +60,7 @@ __FBSDID("$FreeBSD$");
> #include <grp.h>
> #include <errno.h>
> #include <locale.h>
>+#include <jail.h>
> 
> #define	STATUS_MATCH	0
> #define	STATUS_NOMATCH	1
>@@ -78,7 +80,7 @@ enum listtype {
> 	LT_GROUP,
> 	LT_TTY,
> 	LT_PGRP,
>-	LT_JID,
>+	LT_JID, /* jid or jname */
> 	LT_SID,
> 	LT_CLASS
> };
>@@ -585,7 +587,7 @@ usage(void)
> 
> 	fprintf(stderr,
> 		"usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n"
>-		"             [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jid]\n"
>+		"             [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jail]\n"
> 		"             [-s sid] [-t tty] [-u euid] pattern ...\n",
> 		getprogname(), ustr);
> 
>@@ -766,15 +768,19 @@ foundtty:		if ((st.st_mode & S_IFCHR) == 0)
> 
> 			li->li_number = st.st_rdev;
> 			break;
>-		case LT_JID:
>+		case LT_JID: {
>+			int jid;
> 			if (strcmp(sp, "none") == 0)
> 				li->li_number = 0;
> 			else if (strcmp(sp, "any") == 0)
> 				li->li_number = -1;
>+			else if ((jid = jail_getid(sp)) != -1)
>+				li->li_number = jid;
> 			else if (*ep != '\0')
> 				errx(STATUS_BADUSAGE,
>-				     "Invalid jail ID `%s'", sp);
>+				     "Invalid jail ID or name `%s'", sp);
> 			break;
>+		}
> 		case LT_CLASS:
> 			li->li_number = -1;
> 			li->li_name = strdup(sp);
>Index: tests/pgrep-j_test.sh
>===================================================================
>--- tests/pgrep-j_test.sh	(revision 285594)
>+++ tests/pgrep-j_test.sh	(working copy)
>@@ -14,7 +14,7 @@ if [ `id -u` -ne 0 ]; then
> 	exit 0
> fi
> 
>-echo "1..3"
>+echo "1..4"
> 
> sleep=$(pwd)/sleep.txt
> ln -sf /bin/sleep $sleep
>@@ -87,5 +87,30 @@ else
> fi
> [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) 
> [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) 
>+wait
> 
>+# test 4 is like test 1 except with jname instead of jid.
>+name="pgrep -j <jname>"
>+sleep_amount=8
>+jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \
>+    command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount &
>+
>+jail -c path=/ name=${base}_4_2 ip4.addr=127.0.0.1 \
>+    command=daemon -p ${PWD}/${base}_4_2.pid $sleep $sleep_amount &
>+
>+sleep 0.5
>+
>+jid="${base}_4_1,${base}_4_2"
>+pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)"
>+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_4_1.pid)" \
>+    $(cat ${PWD}/${base}_4_2.pid) | sort)
>+if [ "$pid1" = "$pid2" ]; then
>+	echo "ok 4 - $name"
>+else
>+	echo "not ok 4 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
>+fi
>+[ -f ${PWD}/${base}_4_1.pid ] && kill $(cat ${PWD}/${base}_4_1.pid)
>+[ -f ${PWD}/${base}_4_2.pid ] && kill $(cat ${PWD}/${base}_4_2.pid)
>+wait
>+
> rm -f $sleep
>Index: tests/pkill-j_test.sh
>===================================================================
>--- tests/pkill-j_test.sh	(revision 285594)
>+++ tests/pkill-j_test.sh	(working copy)
>@@ -14,7 +14,7 @@ if [ `id -u` -ne 0 ]; then
> 	exit 0
> fi
> 
>-echo "1..3"
>+echo "1..4"
> 
> sleep=$(pwd)/sleep.txt
> ln -sf /bin/sleep $sleep
>@@ -90,5 +90,31 @@ else
> fi 2>/dev/null
> [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
> [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
>+wait
> 
>+# test 4 is like test 1 except with jname instead of jid.
>+name="pkill -j <jname>"
>+sleep_amount=8
>+jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \
>+    command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount &
>+
>+jail -c path=/ name=${base}_4_2 ip4.addr=127.0.0.1 \
>+    command=daemon -p ${PWD}/${base}_4_2.pid $sleep $sleep_amount &
>+
>+$sleep $sleep_amount &
>+
>+sleep 0.5
>+
>+jid="${base}_4_1,${base}_4_2"
>+if pkill -f -j "$jid" $sleep && sleep 0.5 &&
>+    ! -f ${PWD}/${base}_4_1.pid &&
>+    ! -f ${PWD}/${base}_4_2.pid ; then
>+	echo "ok 4 - $name"
>+else
>+	echo "not ok 4 - $name"
>+fi 2>/dev/null
>+[ -f ${PWD}/${base}_4_1.pid ] && kill $(cat ${PWD}/${base}_4_1.pid)
>+[ -f ${PWD}/${base}_4_2.pid ] && kill $(cat ${PWD}/${base}_4_2.pid)
>+wait
>+
> rm -f $sleep

Actions: View | Diff

Attachments on bug 201588: 158800 | 159627 | 159698