VOP_READIR now has a cookie argument

[unix-history] / usr / src / sys / sparc / sunos / sun_misc.c

diff --git a/usr/src/sys/sparc/sunos/sun_misc.c b/usr/src/sys/sparc/sunos/sun_misc.c
index d756a29..fb93de3 100644 (file)
--- a/usr/src/sys/sparc/sunos/sun_misc.c
+++ b/usr/src/sys/sparc/sunos/sun_misc.c
@@ -1,6 +1,6 @@
 /*
 /*

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and


@@ -13,7 +13,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sun_misc.c  7.6 (Berkeley) %G%
+ *     @(#)sun_misc.c  8.3 (Berkeley) %G%

  *
  * from: $Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp $
  */
  *
  * from: $Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp $
  */


@@ -196,9 +196,10 @@ sun_sigpending(p, uap, retval)
        struct sun_sigpending_args *uap;
        int *retval;
 {
        struct sun_sigpending_args *uap;
        int *retval;
 {

-       int mask = p->p_sig & p->p_sigmask;
+       int mask;

 
 

-       return (copyout((caddr_t)&mask, (caddr_t)uap->mask, sizeof(int)));
+       mask = p->p_siglist & p->p_sigmask;
+       return (copyout(&mask, uap->mask, sizeof(int)));

 }
 
 /*
 }
 
 /*


@@ -270,7 +271,7 @@ again:
         * First we read into the malloc'ed buffer, then
         * we massage it into user space, one record at a time.
         */
         * First we read into the malloc'ed buffer, then
         * we massage it into user space, one record at a time.
         */

-       if (error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag))
+       if (error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, (u_long *)0,0))

                goto out;
        inp = buf;
        outp = uap->buf;
                goto out;
        inp = buf;
        outp = uap->buf;