Changeset 370 for trunk/src/gmake/kmkbuiltin/mkdir.c

Timestamp:

Dec 18, 2005, 4:48:02 AM (20 years ago)

Author:

bird

Message:

o Ported all kmk builtins to win32.
o Fixed serveral bugs in kmk builtins.
o Probably broke both linux, bsd and OS/2. :-)

File:

• trunk/src/gmake/kmkbuiltin/mkdir.c (modified) (7 diffs)

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)mkdir.c     8.2 (Berkeley) 1/25/94";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
 #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 $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-//#include <err.h>
+#include "err.h"
 #include <errno.h>
 #ifndef _MSC_VER
@@ -58 +56 @@
 #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
-
+#else
+#include "mscfakes.h"
 #endif 
 
@@ -133 +78 @@
         mode = NULL;
         vflag = 0;
+        /* kmk: reset getopt and set progname */
+        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -166 +113 @@
                 omode = S_IRWXU | S_IRWXG | S_IRWXO;
         } else {
-                if ((set = setmode(mode)) == NULL) {
-                        fprintf(stderr, "%s: invalid file mode: %s\n", mode, argv[0]);
-                        return 1;
-                }
+                if ((set = setmode(mode)) == NULL)
+                        return errx(1, "invalid file mode: %s", mode);
                 omode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
                 free(set);
@@ -181 +126 @@
                 } else if (mkdir(*argv, omode) < 0) {
                         if (errno == ENOTDIR || errno == ENOENT)
-                                fprintf(stderr, "%s: %s: %s\n", argv[0], dirname(*argv), strerror(errno));
+                                warn("%s", dirname(*argv));
                         else
-                                fprintf(stderr, "%s: %s: %s\n", argv[0], *argv, strerror(errno));
+                                warn("%s", *argv);
                         success = 0;
                 } else if (vflag)
@@ -198 +143 @@
                  */
                 if (success && mode != NULL && chmod(*argv, omode) == -1) {
-                        fprintf(stderr, "%s: %s: %s\n", argv[0], *argv, strerror(errno));
+                        warn("%s", *argv);
                         exitval = 1;
                 }
@@ -240 +185 @@
                         continue;
                 *p = '\0';
-                if (p[1] == '\0')
+                if (!last && p[1] == '\0')
                         last = 1;
                 if (first) {