Changeset 1222 in kBuild for trunk/src/kash/setmode.c

Timestamp:

Oct 8, 2007 12:24:31 AM (17 years ago)

Author:

bird

Message:

more fixes - it all compiles now (linking fails of course).

File:

• trunk/src/kash/setmode.c (modified) (7 diffs)

trunk/src/kash/setmode.c

@@ -33 +33 @@
  */
 
-/*#include <sys/cdefs.h>*/
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 static char sccsid[] = "@(#)setmode.c   8.2 (Berkeley) 3/25/94";
 #else
 __RCSID("$NetBSD: setmode.c,v 1.30 2003/08/07 16:42:56 agc Exp $");
-#endif
 #endif /* LIBC_SCCS and not lint */
-
-/*#include "namespace.h"*/
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -49 +47 @@
 #include <ctype.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdlib.h>
 #include "shinstance.h" /* for unistd.h types/defines */
@@ -56 +53 @@
 #include <stdio.h>
 #endif
-
-/*#ifdef __weak_alias
-__weak_alias(getmode,_getmode)
-__weak_alias(setmode,_setmode)
-#endif*/
 
 #define SET_LEN 6               /* initial # of bitcmd struct to malloc */
@@ -77 +69 @@
 #define CMD2_UBITS      0x10
 
-static BITCMD   *addcmd(BITCMD *, int, int, int, u_int);
+static BITCMD   *addcmd(BITCMD *, int, int, int, unsigned int);
 static void      compress_mode(BITCMD *);
 #ifdef SETMODE_DEBUG
@@ -190 +182 @@
 
 void *
-bsd_setmode(const char *p)
+bsd_setmode(shinstance *psh, const char *p)
 {
         int perm, who;
         char op, *ep;
         BITCMD *set, *saveset, *endset;
-#ifndef _MSC_VER
-        sigset_t signset, sigoset;
-#endif
         mode_t mask;
         int equalopdone = 0;    /* pacify gcc */
@@ -207 +196 @@
         /*
          * Get a copy of the mask for the permissions that are mask relative.
-         * Flip the bits, we want what's not set.  Since it's possible that
-         * the caller is opening files inside a signal handler, protect them
-         * as best we can.
+         * Flip the bits, we want what's not set.
          */
-#ifndef _MSC_VER
-        sigfillset(&signset);
-        (void)sigprocmask(SIG_BLOCK, &signset, &sigoset);
-#endif
-        (void)umask(mask = umask(0));
-        mask = ~mask;
-#ifndef _MSC_VER
-        (void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
-#endif
+        mask = shfile_get_umask(&psh->fdtab);
 
         setlen = SET_LEN + 2;
 
-        if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
+        if ((set = malloc(sizeof(BITCMD) * setlen)) == NULL)
                 return (NULL);
         saveset = set;
@@ -372 +351 @@
         int oparg, who;
         int op;
-        u_int mask;
+        unsigned int mask;
 {