minor formatting and comment changes; removed some old #if 0'd code.

[unix-history] / sys / kern / kern_ktrace.c

diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 682730e..5d61807 100644 (file)
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -30,12 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)kern_ktrace.c       7.15 (Berkeley) 6/21/91
+ *     from: @(#)kern_ktrace.c 7.15 (Berkeley) 6/21/91
+ *     $Id: kern_ktrace.c,v 1.5 1993/11/25 01:33:00 wollman Exp $

  */
 
 #ifdef KTRACE
 
 #include "param.h"
  */
 
 #ifdef KTRACE
 
 #include "param.h"

+#include "systm.h"

 #include "proc.h"
 #include "file.h"
 #include "namei.h"
 #include "proc.h"
 #include "file.h"
 #include "namei.h"


@@ -44,8 +46,14 @@
 #include "malloc.h"
 #include "syslog.h"
 
 #include "malloc.h"
 #include "syslog.h"
 

-struct ktr_header *
+static void ktrwrite(struct vnode *, struct ktr_header *);
+static int ktrops(struct proc *, struct proc *, int, int, struct vnode *);
+static int ktrsetchildren(struct proc *, struct proc *, int, int, struct vnode *);
+static int ktrcanset(struct proc *, struct proc *);
+
+static struct ktr_header *

 ktrgetheader(type)
 ktrgetheader(type)

+       int type;

 {
        register struct ktr_header *kth;
        struct proc *p = curproc;       /* XXX */
 {
        register struct ktr_header *kth;
        struct proc *p = curproc;       /* XXX */


@@ -59,6 +67,7 @@ ktrgetheader(type)
        return (kth);
 }
 
        return (kth);
 }
 

+void

 ktrsyscall(vp, code, narg, args)
        struct vnode *vp;
        int code, narg, args[];
 ktrsyscall(vp, code, narg, args)
        struct vnode *vp;
        int code, narg, args[];


@@ -81,6 +90,7 @@ ktrsyscall(vp, code, narg, args)
        FREE(kth, M_TEMP);
 }
 
        FREE(kth, M_TEMP);
 }
 

+void

 ktrsysret(vp, code, error, retval)
        struct vnode *vp;
        int code, error, retval;
 ktrsysret(vp, code, error, retval)
        struct vnode *vp;
        int code, error, retval;


@@ -99,6 +109,7 @@ ktrsysret(vp, code, error, retval)
        FREE(kth, M_TEMP);
 }
 
        FREE(kth, M_TEMP);
 }
 

+void

 ktrnamei(vp, path)
        struct vnode *vp;
        char *path;
 ktrnamei(vp, path)
        struct vnode *vp;
        char *path;


@@ -112,11 +123,14 @@ ktrnamei(vp, path)
        FREE(kth, M_TEMP);
 }
 
        FREE(kth, M_TEMP);
 }
 

+void

 ktrgenio(vp, fd, rw, iov, len, error)
        struct vnode *vp;
        int fd;
        enum uio_rw rw;
        register struct iovec *iov;
 ktrgenio(vp, fd, rw, iov, len, error)
        struct vnode *vp;
        int fd;
        enum uio_rw rw;
        register struct iovec *iov;

+       int len;
+       int error;

 {
        struct ktr_header *kth = ktrgetheader(KTR_GENIO);
        register struct ktr_genio *ktp;
 {
        struct ktr_header *kth = ktrgetheader(KTR_GENIO);
        register struct ktr_genio *ktp;


@@ -148,9 +162,13 @@ done:
        FREE(ktp, M_TEMP);
 }
 
        FREE(ktp, M_TEMP);
 }
 

+void

 ktrpsig(vp, sig, action, mask, code)
        struct  vnode *vp;
 ktrpsig(vp, sig, action, mask, code)
        struct  vnode *vp;

+       int sig;

        sig_t   action;
        sig_t   action;

+       int mask;
+       int code;

 {
        struct ktr_header *kth = ktrgetheader(KTR_PSIG);
        struct ktr_psig kp;
 {
        struct ktr_header *kth = ktrgetheader(KTR_PSIG);
        struct ktr_psig kp;


@@ -180,6 +198,7 @@ struct ktrace_args {
 };
 
 /* ARGSUSED */
 };
 
 /* ARGSUSED */

+int

 ktrace(curp, uap, retval)
        struct proc *curp;
        register struct ktrace_args *uap;
 ktrace(curp, uap, retval)
        struct proc *curp;
        register struct ktrace_args *uap;


@@ -274,8 +293,11 @@ done:
        return (error);
 }
 
        return (error);
 }
 

+static int

 ktrops(curp, p, ops, facs, vp)
        struct proc *curp, *p;
 ktrops(curp, p, ops, facs, vp)
        struct proc *curp, *p;

+       int ops;
+       int facs;

        struct vnode *vp;
 {
 
        struct vnode *vp;
 {
 


@@ -309,8 +331,11 @@ ktrops(curp, p, ops, facs, vp)
        return (1);
 }
 
        return (1);
 }
 

+static int

 ktrsetchildren(curp, top, ops, facs, vp)
        struct proc *curp, *top;
 ktrsetchildren(curp, top, ops, facs, vp)
        struct proc *curp, *top;

+       int ops;
+       int facs;

        struct vnode *vp;
 {
        register struct proc *p;
        struct vnode *vp;
 {
        register struct proc *p;


@@ -343,6 +368,7 @@ ktrsetchildren(curp, top, ops, facs, vp)
        /*NOTREACHED*/
 }
 
        /*NOTREACHED*/
 }
 

+static void

 ktrwrite(vp, kth)
        struct vnode *vp;
        register struct ktr_header *kth;
 ktrwrite(vp, kth)
        struct vnode *vp;
        register struct ktr_header *kth;


@@ -397,6 +423,7 @@ ktrwrite(vp, kth)
  *
  * TODO: check groups.  use caller effective gid.
  */
  *
  * TODO: check groups.  use caller effective gid.
  */

+static int

 ktrcanset(callp, targetp)
        struct proc *callp, *targetp;
 {
 ktrcanset(callp, targetp)
        struct proc *callp, *targetp;
 {