Changeset 1221 for trunk/src/kash/setmode.c

Timestamp:

Oct 8, 2007, 1:15:00 AM (18 years ago)

Author:

bird

Message:

more cleanup.

File:

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

trunk/src/kash/setmode.c

@@ -51 +51 @@
 #include <signal.h>
 #include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#else
-#include "mscfakes.h"
-#endif 
+#include "shinstance.h" /* for unistd.h types/defines */
 
 #ifdef SETMODE_DEBUG
@@ -89 +85 @@
 #ifndef _DIAGASSERT
 # define _DIAGASSERT assert
-#endif 
+#endif
 
 #ifndef S_ISTXT
@@ -106 +102 @@
  */
 mode_t
-getmode(bbox, omode)
-        const void *bbox;
-        mode_t omode;
+bsd_getmode(const void *bbox, mode_t omode)
 {
         const BITCMD *set;
@@ -196 +190 @@
 
 void *
-setmode(p)
-        const char *p;
+bsd_setmode(const char *p)
 {
         int perm, who;
@@ -221 +214 @@
         sigfillset(&signset);
         (void)sigprocmask(SIG_BLOCK, &signset, &sigoset);
-#endif 
+#endif
         (void)umask(mask = umask(0));
         mask = ~mask;
@@ -229 +222 @@
 
         setlen = SET_LEN + 2;
-        
+
         if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
                 return (NULL);
@@ -290 +283 @@
                         case 's':
                                 /*
-                                 * If specific bits where requested and 
-                                 * only "other" bits ignore set-id. 
+                                 * If specific bits where requested and
+                                 * only "other" bits ignore set-id.
                                  */
                                 if (who == 0 || (who & ~S_IRWXO))
@@ -298 +291 @@
                         case 't':
                                 /*
-                                 * If specific bits where requested and 
-                                 * only "other" bits ignore set-id. 
+                                 * If specific bits where requested and
+                                 * only "other" bits ignore set-id.
                                  */
                                 if (who == 0 || (who & ~S_IRWXO)) {
@@ -412 +405 @@
                         set->bits = mask;
                 }
-        
+
                 if (oparg == '+')
                         set->cmd2 |= CMD2_SET;
@@ -446 +439 @@
  * Given an array of bitcmd structures, compress by compacting consecutive
  * '+', '-' and 'X' commands into at most 3 commands, one of each.  The 'u',
- * 'g' and 'o' commands continue to be separate.  They could probably be 
+ * 'g' and 'o' commands continue to be separate.  They could probably be
  * compacted, but it's not worth the effort.
  */