A couple of fixes from bruce: first of all, psignal is a void (stupid

me; unfortunately, also makes it hard ot check for errors); second, I had
managed to forget a change to PIOCSFL (it should be _IOW, not _IOR) I had
in my local copy, and Bruce called me on it.

Submitted by:	bde
This commit is contained in:
Sean Eric Fagan 1997-12-08 22:09:39 +00:00
parent 0bfc6e6706
commit bfcfe2e1b1
3 changed files with 8 additions and 8 deletions

View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $Id: procfs_vnops.c,v 1.44 1997/12/06 04:11:13 sef Exp $
* $Id: procfs_vnops.c,v 1.45 1997/12/07 04:01:03 sef Exp $
*/
/*
@ -50,6 +50,7 @@
#include <sys/lock.h>
#include <sys/fcntl.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <sys/namei.h>
#include <sys/malloc.h>
@ -275,8 +276,7 @@ procfs_ioctl(ap)
if (ap->a_data && (signo = *(int*)ap->a_data)) {
if (signo >= NSIG || signo <= 0)
return EINVAL;
if (error = psignal(procp, signo))
return error;
psignal(procp, signo);
}
procp->p_step = 0;
wakeup(&procp->p_step);

View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $Id: procfs_vnops.c,v 1.44 1997/12/06 04:11:13 sef Exp $
* $Id: procfs_vnops.c,v 1.45 1997/12/07 04:01:03 sef Exp $
*/
/*
@ -50,6 +50,7 @@
#include <sys/lock.h>
#include <sys/fcntl.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <sys/namei.h>
#include <sys/malloc.h>
@ -275,8 +276,7 @@ procfs_ioctl(ap)
if (ap->a_data && (signo = *(int*)ap->a_data)) {
if (signo >= NSIG || signo <= 0)
return EINVAL;
if (error = psignal(procp, signo))
return error;
psignal(procp, signo);
}
procp->p_step = 0;
wakeup(&procp->p_step);

View File

@ -1,7 +1,7 @@
/*
* procfs ioctl definitions.
*
* $Id: pioctl.h,v 1.1 1997/12/06 04:11:14 sef Exp $
* $Id: pioctl.h,v 1.2 1997/12/07 03:59:26 sef Exp $
*/
#ifndef _SYS_PIOCTL_H
@ -19,7 +19,7 @@ struct procfs_status {
# define PIOCBIS _IOW('p', 1, unsigned int) /* Set event flag */
# define PIOCBIC _IOW('p', 2, unsigned int) /* Clear event flag */
# define PIOCSFL _IOR('p', 3, unsigned int) /* Set flags */
# define PIOCSFL _IOW('p', 3, unsigned int) /* Set flags */
/* wait for proc to stop */
# define PIOCWAIT _IOR('p', 4, struct procfs_status)
# define PIOCCONT _IOW('p', 5, int) /* Continue a process */