Changeset 361 for trunk/src/gmake

Timestamp:

Dec 13, 2005, 5:42:38 AM (20 years ago)

Author:

bird

Message:

Ported to MSC

Location:

trunk/src/gmake/kmkbuiltin

Files:

• mkdir.c (modified) (2 diffs)
• setmode.c (modified) (5 diffs)

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -39 +39 @@
 #endif /* not lint */
 #endif
+#ifndef _MSC_VER
 #include <sys/cdefs.h>
+#endif 
 //__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
 
@@ -47 +49 @@
 //#include <err.h>
 #include <errno.h>
+#ifndef _MSC_VER
 #include <libgen.h>
+#endif 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <sysexits.h>
 #include <unistd.h>
+#endif 
+
+#ifdef _MSC_VER
+#define setmode setmode_msc
+#include <stdarg.h>
+#include <io.h>
+#include <direct.h>
+#undef setmode
+#include "getopt.h"
+
+typedef int mode_t;
+#define EX_USAGE 1
+void warn(const char *fmt, ...)
+{
+    int err = errno;
+    va_list args;
+    va_start(args, fmt);
+    fprintf(stderr, "mkdir: ");
+    vfprintf(stderr, fmt, args);
+    fprintf(stderr, ": %s\n", strerror(err));
+    va_end(args);
+}
+
+int mkdir_msc(const char *path, mode_t mode)
+{
+    int rc = mkdir(path);
+    if (rc)
+    {
+        int len = strlen(path);
+        if (len > 0 && (path[len - 1] == '/' || path[len - 1] == '\\'))
+        {
+            char *str = strdup(path);
+            while (len > 0 && (str[len - 1] == '/' || str[len - 1] == '\\'))
+                str[--len] = '\0';
+            rc = mkdir(str);
+            free(str);
+        }
+    }
+    return rc;
+}
+#define mkdir(a,b) mkdir_msc(a,b)
+
+char *dirname(char *path)
+{         
+    return path;
+}
+
+#define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
+#define S_IRWXG 0000070
+#define S_IRWXO 0000007
+#define S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC)
+#define S_IXUSR _S_IEXEC
+#define S_IWUSR _S_IWRITE
+#define S_IRUSR _S_IREAD
+
+#endif 
 
 extern void * setmode(const char *p);

trunk/src/gmake/kmkbuiltin/setmode.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)setmode.c   8.2 (Berkeley) 3/25/94";
 #endif /* LIBC_SCCS and not lint */
+#ifndef _MSC_VER
 #include <sys/cdefs.h>
+#endif 
 //__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.9 2003/02/23 00:24:03 mikeh Exp $");
 
@@ -49 +51 @@
 #include <stddef.h>
 #include <stdlib.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif 
 
 #ifdef SETMODE_DEBUG
@@ -55 +59 @@
 #endif
 //#include "un-namespace.h"
+
+#ifdef _MSC_VER
+#define setmode setmode_msc
+#include <io.h>
+#undef setmode
+typedef unsigned int u_int;
+typedef int mode_t;
+#define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
+#define S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC)
+#define S_IXUSR _S_IEXEC
+#define S_IWUSR _S_IWRITE
+#define S_IRUSR _S_IREAD
+#define S_IRWXG 0000070
+#define S_IRGRP 0000040
+#define S_IWGRP 0000020
+#define S_IXGRP 0000010
+#define S_IRWXO 0000007
+#define S_IROTH 0000004
+#define S_IWOTH 0000002
+#define S_IXOTH 0000001
+#define S_ISUID 0004000
+#define S_ISGID 0002000
+#endif /* _MSC_VER */
+
 
 #define SET_LEN 6               /* initial # of bitcmd struct to malloc */
@@ -187 +215 @@
         char op, *ep;
         BITCMD *set, *saveset, *endset;
+#ifndef _MSC_VER
         sigset_t sigset, sigoset;
+#endif 
         mode_t mask;
         int equalopdone=0, permXbits, setlen;
@@ -201 +231 @@
          * as best we can.
          */
+#ifndef _MSC_VER
         sigfillset(&sigset);
         (void)sigprocmask(SIG_BLOCK, &sigset, &sigoset);
+#endif 
         (void)umask(mask = umask(0));
         mask = ~mask;
+#ifndef _MSC_VER
         (void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
+#endif 
 
         setlen = SET_LEN + 2;