Deleted Added
full compact
procfs_ctl.c (50477) procfs_ctl.c (51791)
1/*
2 * Copyright (c) 1993 Jan-Simon Pendry
3 * Copyright (c) 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * Jan-Simon Pendry.
8 *

--- 23 unchanged lines hidden (view full) ---

32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * @(#)procfs_ctl.c 8.4 (Berkeley) 6/15/94
38 *
39 * From:
1/*
2 * Copyright (c) 1993 Jan-Simon Pendry
3 * Copyright (c) 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * Jan-Simon Pendry.
8 *

--- 23 unchanged lines hidden (view full) ---

32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * @(#)procfs_ctl.c 8.4 (Berkeley) 6/15/94
38 *
39 * From:
40 * $FreeBSD: head/sys/fs/procfs/procfs_ctl.c 50477 1999-08-28 01:08:13Z peter $
40 * $FreeBSD: head/sys/fs/procfs/procfs_ctl.c 51791 1999-09-29 15:03:48Z marcel $
41 */
42
43#include <sys/param.h>
44#include <sys/systm.h>
45#include <sys/proc.h>
46#include <sys/vnode.h>
47#include <sys/ptrace.h>
48#include <sys/signalvar.h>

--- 138 unchanged lines hidden (view full) ---

187 /* if not being traced, then this is a painless no-op */
188 if ((p->p_flag & P_TRACED) == 0)
189 return (0);
190
191 /* not being traced any more */
192 p->p_flag &= ~P_TRACED;
193
194 /* remove pending SIGTRAP, else the process will die */
41 */
42
43#include <sys/param.h>
44#include <sys/systm.h>
45#include <sys/proc.h>
46#include <sys/vnode.h>
47#include <sys/ptrace.h>
48#include <sys/signalvar.h>

--- 138 unchanged lines hidden (view full) ---

187 /* if not being traced, then this is a painless no-op */
188 if ((p->p_flag & P_TRACED) == 0)
189 return (0);
190
191 /* not being traced any more */
192 p->p_flag &= ~P_TRACED;
193
194 /* remove pending SIGTRAP, else the process will die */
195 p->p_siglist &= ~sigmask (SIGTRAP);
195 SIGDELSET(p->p_siglist, SIGTRAP);
196
197 /* give process back to original parent */
198 if (p->p_oppid != p->p_pptr->p_pid) {
199 struct proc *pp;
200
201 pp = pfind(p->p_oppid);
202 if (pp)
203 proc_reparent(p, pp);

--- 112 unchanged lines hidden ---
196
197 /* give process back to original parent */
198 if (p->p_oppid != p->p_pptr->p_pid) {
199 struct proc *pp;
200
201 pp = pfind(p->p_oppid);
202 if (pp)
203 proc_reparent(p, pp);

--- 112 unchanged lines hidden ---