setgroups check int > NGROUPS, so negative would fail; minor cleanup

[unix-history] / usr / src / sys / kern / sysv_shm.c

diff --git a/usr/src/sys/kern/sysv_shm.c b/usr/src/sys/kern/sysv_shm.c
index f5d3bd9..7bedea8 100644 (file)
--- a/usr/src/sys/kern/sysv_shm.c
+++ b/usr/src/sys/kern/sysv_shm.c
@@ -11,11 +11,13 @@
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *

- *     @(#)sysv_shm.c  7.7 (Berkeley) %G%
+ *     @(#)sysv_shm.c  7.9 (Berkeley) %G%

  */
 
 /*
  * System V shared memory routines.
  */
 
 /*
  * System V shared memory routines.

+ * TEMPORARY, until mmap is in place;
+ * needed now for HP-UX compatibility and X server (yech!).

  */
 
 #ifdef SYSVSHM
  */
 
 #ifdef SYSVSHM


@@ -24,7 +26,7 @@
 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"

-#include "syscontext.h"
+#include "user.h"

 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"


@@ -61,14 +63,14 @@ shminit()
 shmsys(p, uap, retval)
        struct proc *p;
        struct args {
 shmsys(p, uap, retval)
        struct proc *p;
        struct args {

-               int which;
+               u_int which;

        } *uap;
        int *retval;
 {
 
        if (uap->which >= sizeof(shmcalls)/sizeof(shmcalls[0]))
        } *uap;
        int *retval;
 {
 
        if (uap->which >= sizeof(shmcalls)/sizeof(shmcalls[0]))

-               RETURN (EINVAL);
-       RETURN ((*shmcalls[uap->which])(p, &uap[1], retval));
+               return (EINVAL);
+       return ((*shmcalls[uap->which])(p, &uap[1], retval));

 }
 
 /*
 }
 
 /*