Changeset 370 in kBuild

Timestamp:

Dec 18, 2005 3:48:02 AM (19 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. :-)

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (7 diffs)
• kmkbuiltin.c (modified) (5 diffs)
• kmkbuiltin.h (modified) (1 diff)
• kmkbuiltin/append.c (modified) (5 diffs)
• kmkbuiltin/cp.c (modified) (25 diffs)
• kmkbuiltin/cp_extern.h (modified) (2 diffs)
• kmkbuiltin/cp_utils.c (modified) (19 diffs)
• kmkbuiltin/echo.c (modified) (4 diffs)
• kmkbuiltin/err.c (added)
• kmkbuiltin/err.h (added)
• kmkbuiltin/fts.c (added)
• kmkbuiltin/ftsfake.h (added)
• kmkbuiltin/install.c (modified) (50 diffs)
• kmkbuiltin/ln.c (modified) (10 diffs)
• kmkbuiltin/mkdir.c (modified) (7 diffs)
• kmkbuiltin/mscfakes.c (added)
• kmkbuiltin/mscfakes.h (added)
• kmkbuiltin/rm.c (modified) (16 diffs)
• kmkbuiltin/setmode.c (modified) (3 diffs)
• kmkbuiltin/strlcpy.c (modified) (1 diff)
• kmkbuiltin/strmode.c (modified) (5 diffs)
• variable.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -71 +71 @@
         kmkbuiltin/echo.c \
         kmkbuiltin/mkdir.c \
-        kmkbuiltin/setmode.c
+        kmkbuiltin/ln.c \
+        kmkbuiltin/install.c \
+        kmkbuiltin/rm.c \
+        \
+        kmkbuiltin/err.c \
+        kmkbuiltin/setmode.c \
+        kmkbuiltin/strmode.c
 ifneq ($(BUILD_TARGET),win32)
 kmk_SOURCES += \
-        kmkbuiltin/rm.c \
         kmkbuiltin/cp.c \
         kmkbuiltin/cp_utils.c \
-        kmkbuiltin/ln.c \
-        kmkbuiltin/install.c \
         \
-        kmkbuiltin/strmode.c \
         kmkbuiltin/strlcpy.c
 endif
+kmk_SOURCES.win32 += kmkbuiltin/mscfakes.c
 
 
@@ -88 +91 @@
 # Standalone kmkbuiltin commands.
 #
-ifneq ($(BUILD_TARGET),win32)
-PROGRAMS += kmk_append kmk_cp kmk_echo kmk_mkdir kmk_rm kmk_install kmk_ln
-else
-PROGRAMS += kmk_append kmk_echo kmk_mkdir
-endif
+PROGRAMS += kmk_append kmk_cp kmk_echo kmk_mkdir kmk_install kmk_ln kmk_rm 
 
 kmk_append_TEMPLATE = BIN
@@ -99 +98 @@
 kmk_append_SOURCES = \
         kmkbuiltin/append.c \
+        kmkbuiltin/err.c
 
 kmk_cp_TEMPLATE = BIN
@@ -105 +105 @@
         kmkbuiltin/cp.c \
         kmkbuiltin/cp_utils.c \
-    kmkbuiltin/strlcpy.c
+    kmkbuiltin/strlcpy.c \
+        kmkbuiltin/err.c
+kmk_cp_INCS.win32 = $(PATH_TARGET) .
+kmk_cp_DEFS.win32 = HAVE_CONFIG_H
+kmk_cp_SOURCES.win32 = \
+        kmkbuiltin/mscfakes.c \
+        kmkbuiltin/fts.c \
+        w32/compat/dirent.c \
+        getopt.c \
+        getopt1.c
 
 kmk_echo_TEMPLATE = BIN
@@ -111 +120 @@
 kmk_echo_SOURCES = \
         kmkbuiltin/echo.c
+kmk_echo_SOURCES.win32 = \
+        kmkbuiltin/mscfakes.c \
+        kmkbuiltin/err.c
 
 kmk_install_TEMPLATE = BIN
 kmk_install_DEFS = kmk_builtin_install=main
 kmk_install_SOURCES = \
-        kmkbuiltin/install.c
+        kmkbuiltin/install.c \
+        kmkbuiltin/err.c \
+        kmkbuiltin/strmode.c \
+        kmkbuiltin/setmode.c
+kmk_install_INCS.win32 = $(PATH_TARGET) .
+kmk_install_DEFS.win32 = HAVE_CONFIG_H
+kmk_install_SOURCES.win32 = \
+        kmkbuiltin/mscfakes.c \
+        getopt.c \
+        getopt1.c
 
 kmk_ln_TEMPLATE = BIN
 kmk_ln_DEFS = kmk_builtin_ln=main
 kmk_ln_SOURCES = \
-        kmkbuiltin/ln.c
+        kmkbuiltin/ln.c \
+        kmkbuiltin/err.c
+kmk_ln_INCS.win32 = $(PATH_TARGET) .
+kmk_ln_DEFS.win32 = HAVE_CONFIG_H
+kmk_ln_SOURCES.win32 = \
+        kmkbuiltin/mscfakes.c\
+        getopt.c \
+        getopt1.c
 
 kmk_mkdir_TEMPLATE = BIN
@@ -126 +154 @@
 kmk_mkdir_SOURCES = \
         kmkbuiltin/mkdir.c \
+        kmkbuiltin/err.c \
         kmkbuiltin/setmode.c
 kmk_mkdir_INCS.win32 = $(PATH_TARGET) .
 kmk_mkdir_DEFS.win32 = HAVE_CONFIG_H
 kmk_mkdir_SOURCES.win32 = \
-        getopt.c \
-        getopt1.c \
+        kmkbuiltin/mscfakes.c \
+        getopt.c \
+        getopt1.c
 
 kmk_rm_TEMPLATE = BIN
@@ -137 +167 @@
 kmk_rm_SOURCES = \
         kmkbuiltin/rm.c \
-        kmkbuiltin/setmode.c \
+        kmkbuiltin/err.c \
         kmkbuiltin/strmode.c
+kmk_rm_INCS.win32 = $(PATH_TARGET) .
+kmk_rm_DEFS.win32 = HAVE_CONFIG_H
+kmk_rm_SOURCES.win32 = \
+        kmkbuiltin/mscfakes.c\
+        getopt.c \
+        getopt1.c
 
 

trunk/src/gmake/kmkbuiltin.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <ctype.h>
+#include "kmkbuiltin/err.h"
 #include "kmkbuiltin.h"
 
@@ -178 +179 @@
     if (!strcmp(pszCmd, "append"))
         rc = kmk_builtin_append(argc, argv, environ);
-#ifndef _MSC_VER
-    else if (!strcmp(pszCmd, "cp"))
-        rc = kmk_builtin_cp(argc, argv, environ);
-    //else if (!strcmp(pszCmd, "chmod"))
-    //    rc = kmk_builtin_chmod(argc, argv, environ);
-#endif
     else if (!strcmp(pszCmd, "echo"))
         rc = kmk_builtin_echo(argc, argv, environ);
@@ -192 +187 @@
     else if (!strcmp(pszCmd, "mkdir"))
         rc = kmk_builtin_mkdir(argc, argv, environ);
-#ifndef _MSC_VER
     //else if (!strcmp(pszCmd, "mv"))
     //    rc = kmk_builtin_mv(argc, argv, environ);
@@ -199 +193 @@
     //else if (!strcmp(pszCmd, "rmdir"))
     //    rc = kmk_builtin_rmdir(argc, argv, environ);
+    /* obsolete */
+#ifndef _MSC_VER
+    else if (!strcmp(pszCmd, "cp"))
+        rc = kmk_builtin_cp(argc, argv, environ);
 #endif
     else
@@ -205 +203 @@
         return 1;
     }
+    g_progname = "kmk";                 /* paranoia, make sure it's not pointing at a freed argv[0]. */
     return rc;
 }

trunk/src/gmake/kmkbuiltin.h

@@ -30 +30 @@
 extern int kmk_builtin_append(int argc, char **argv, char **envp);
 extern int kmk_builtin_cp(int argc, char **argv, char **envp);
-extern int kmk_builtin_chmod(int argc, char **argv, char **envp);
 extern int kmk_builtin_echo(int argc, char **argv, char **envp);
 extern int kmk_builtin_install(int argc, char **argv, char **envp);

trunk/src/gmake/kmkbuiltin/append.c

@@ -27 +27 @@
 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
+#include "err.h"
 #include "kmkbuiltin.h"
 
@@ -38 +38 @@
     FILE *pFile;
 
+    g_progname = argv[0];
+
     /*
      * Open the output file.
@@ -43 +45 @@
     if (argc <= 1)
     {
-        fprintf(stderr, "append: missing filename!\n");
+        errx(1, "missing filename!");
         fprintf(stderr, "usage: append file [string ...]\n");
         return 1;
@@ -49 +51 @@
     pFile = fopen(argv[1], "a");
     if (!pFile)
-    {
-        fprintf(stderr, "append: failed to open '%s': %s\n", argv[1], strerror(errno));
-        return 1;
-    }
+        return err(1, "failed to open '%s'.", argv[1]);
 
     /*
@@ -72 +71 @@
         ||  ferror(pFile))
     {
-        fprintf(stderr, "append: error writing to '%s'!\n", argv[1]);
         fclose(pFile);
-        return 1;
+        return errx(1, "error writing to '%s'!", argv[1]);
     }
     if (fclose(pFile))
-    {
-        fprintf(stderr, "append: failed to fclose '%s': %s\n", argv[1], strerror(errno));
-        return 1;
-    }
+        return err(1, "failed to fclose '%s'!", argv[1]);
     return 0;
 }

trunk/src/gmake/kmkbuiltin/cp.c

@@ -41 +41 @@
 static char sccsid[] = "@(#)cp.c        8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
-#endif
 #include <sys/cdefs.h>
-//__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.50 2004/04/06 20:06:44 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.50 2004/04/06 20:06:44 markm Exp $");
+#endif
 
 /*
@@ -63 +63 @@
 #include <sys/stat.h>
 
-#include <err.h>
+#include "err.h"
 #include <errno.h>
+#ifdef DO_CP_TREE
 #include <fts.h>
+#endif 
 #include <limits.h>
 #include <signal.h>
@@ -71 +73 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#include "ftsfake.h"
+#endif 
 
 #include "cp_extern.h"
@@ -103 +110 @@
 
 int fflag, iflag, nflag, pflag, vflag;
-int Rflag, rflag;
+static int Rflag, rflag;
 volatile sig_atomic_t info;
 
@@ -122 +129 @@
         char *target;
 
-        argv0 = argv[0];
+        /* init globals */
+        cp_argv0 = argv[0];
         to.p_end = to.p_path;
         to.target_end = emptystring;
@@ -128 +136 @@
         fflag = iflag = nflag = pflag = vflag = Rflag = rflag = 0;
         info = 0;
+        /* reset getopt and set progname. */
+        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -154 +164 @@
                         break;
                 case 'R':
+#ifdef DO_CP_TREE
                         Rflag = 1;
                         break;
+#else
+                        return errx(1, "recursive copy is not implemented!");
+#endif 
                 case 'f':
                         fflag = 1;
@@ -172 +186 @@
                         break;
                 case 'r':
+#ifdef DO_CP_TREE
                         rflag = 1;
                         break;
+#else
+                        return errx(1, "recursive copy is not implemented!");
+#endif 
                 case 'v':
                         vflag = 1;
                         break;
                 default:
-                        usage();
-                        break;
+                        return usage();
                 }
         argc -= optind;
@@ -185 +202 @@
 
         if (argc < 2)
-                usage();
+                return usage();
 
         fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
         if (rflag) {
-                if (Rflag) {
-                        fprintf(stderr,
-                            "%s: the -R and -r options may not be specified together.\n", argv0);
-                        return 1;
-                }
-                if (Hflag || Lflag || Pflag) {
-                        fprintf(stderr, "%s: the -H, -L, and -P options may not be specified with the -r option.\n", argv0);
-                        return 1;
-                }
+                if (Rflag)
+                        return errx(1,
+                    "the -R and -r options may not be specified together.");
+                if (Hflag || Lflag || Pflag)
+                        errx(1,
+        "the -H, -L, and -P options may not be specified with the -r option.");
+#ifdef DO_CP_TREE
                 fts_options &= ~FTS_PHYSICAL;
                 fts_options |= FTS_LOGICAL;
+#endif 
         }
+#ifdef DO_CP_TREE
         if (Rflag) {
                 if (Hflag)
@@ -208 +225 @@
                         fts_options |= FTS_LOGICAL;
                 }
-        } else {
+        } else 
+#endif 
+        {
                 fts_options &= ~FTS_PHYSICAL;
                 fts_options |= FTS_LOGICAL | FTS_COMFOLLOW;
@@ -218 +237 @@
         /* Save the target base in "to". */
         target = argv[--argc];
-        if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path)) {
-                fprintf(stderr, "%s: %s: name too long\n", argv0, target);
-                return 1;
-        }
+        if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path))
+                return errx(1, "%s: name too long", target);
         to.p_end = to.p_path + strlen(to.p_path);
         if (to.p_path == to.p_end) {
@@ -250 +267 @@
          */
         r = stat(to.p_path, &to_stat);
-        if (r == -1 && errno != ENOENT) {
-                fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
-        }
+        if (r == -1 && errno != ENOENT)
+                return err(1, "%s", to.p_path);
         if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
                 /*
                  * Case (1).  Target is not a directory.
                  */
-                if (argc > 1) {
-                        usage();
-                        return 1;
-                }
+                if (argc > 1)
+                        return usage();
                 /*
                  * Need to detect the case:
@@ -283 +297 @@
                 if (have_trailing_slash && type == FILE_TO_FILE) {
                         if (r == -1)
-                                fprintf(stderr, "%s: directory %s does not exist\n", argv0,
-                                     to.p_path);
+                                return errx(1, "directory %s does not exist",
+                                            to.p_path);
                         else
-                                fprintf(stderr, "%s: %s is not a directory\n", argv0, to.p_path);
-                        return 1;
+                                return errx(1, "%s is not a directory", to.p_path);
                 }
         } else
@@ -316 +329 @@
         umask(~mask);
 
-        if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL) {
-                fprintf(stderr, "%s: fts_open: %s\n", argv0, strerror(errno));
-                return 1;
-        }
+        if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
+                return err(1, "fts_open");
         for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
                 switch (curr->fts_info) {
@@ -325 +336 @@
                 case FTS_DNR:
                 case FTS_ERR:
-                        fprintf(stderr, "%s: %s: %s\n",
-                            argv0, curr->fts_path, strerror(curr->fts_errno));
+                        warnx("%s: %s",
+                            curr->fts_path, strerror(curr->fts_errno));
                         badcp = rval = 1;
                         continue;
                 case FTS_DC:                    /* Warn, continue. */
-                        fprintf(stderr, "%s: %s: directory causes a cycle\n", argv0, curr->fts_path);
+                        warnx("%s: directory causes a cycle", curr->fts_path);
                         badcp = rval = 1;
                         continue;
@@ -381 +392 @@
                         *target_mid = 0;
                         if (target_mid - to.p_path + nlen >= PATH_MAX) {
-                                fprintf(stderr, "%s: %s%s: name too long (not copied)\n", argv0,
+                                warnx("%s%s: name too long (not copied)",
                                     to.p_path, p);
                                 badcp = rval = 1;
@@ -417 +428 @@
                                     ((mode | S_IRWXU) & mask) != (mode & mask))
                                         if (chmod(to.p_path, mode & mask) != 0){
-                                                fprintf(stderr, "%s: chmod: %s: %s\n", argv0, to.p_path, strerror(errno));
+                                                warn("chmod: %s", to.p_path);
                                                 rval = 1;
                                         }
@@ -429 +440 @@
                 else {
                         if (to_stat.st_dev == curr->fts_statp->st_dev &&
-                            to_stat.st_ino == curr->fts_statp->st_ino) {
-                                fprintf(stderr, "%s: %s and %s are identical (not copied).\n",
-                                    argv0, to.p_path, curr->fts_path);
+                            to_stat.st_dev != 0 &&
+                            to_stat.st_ino == curr->fts_statp->st_ino &&
+                            to_stat.st_ino != 0) {
+                                warnx("%s and %s are identical (not copied).",
+                                    to.p_path, curr->fts_path);
                                 badcp = rval = 1;
                                 if (S_ISDIR(curr->fts_statp->st_mode))
@@ -439 +452 @@
                         if (!S_ISDIR(curr->fts_statp->st_mode) &&
                             S_ISDIR(to_stat.st_mode)) {
-                                fprintf(stderr,
-                                    "%s: cannot overwrite directory %s with "
-                                    "non-directory %s\n",
-                                    argv0, to.p_path, curr->fts_path);
+                                warnx("cannot overwrite directory %s with "
+                                    "non-directory %s",
+                                    to.p_path, curr->fts_path);
                                 badcp = rval = 1;
                                 continue;
@@ -450 +462 @@
 
                 switch (curr->fts_statp->st_mode & S_IFMT) {
+#ifdef S_IFLNK
                 case S_IFLNK:
                         /* Catch special case of a non-dangling symlink */
@@ -462 +475 @@
                         }
                         break;
+#endif
                 case S_IFDIR:
                         if (!Rflag && !rflag) {
-                                fprintf(stderr, "%s: %s is a directory (not copied).\n",
-                                    argv0, curr->fts_path);
+                                warnx("%s is a directory (not copied).",
+                                    curr->fts_path);
                                 (void)fts_set(ftsp, curr, FTS_SKIP);
                                 badcp = rval = 1;
@@ -480 +494 @@
                         if (dne) {
                                 if (mkdir(to.p_path,
-                                    curr->fts_statp->st_mode | S_IRWXU) < 0) {
-                                        fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
-                                        return 1;
-                                }
+                                    curr->fts_statp->st_mode | S_IRWXU) < 0)
+                                        return err(1, "%s", to.p_path);
                         } else if (!S_ISDIR(to_stat.st_mode)) {
                                 errno = ENOTDIR;
-                                fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
+                                return err(1, "%s", to.p_path);
                         }
                         /*
@@ -495 +507 @@
                         curr->fts_number = pflag || dne;
                         break;
+#ifdef S_IFBLK
                 case S_IFBLK:
+#endif
                 case S_IFCHR:
                         if (Rflag) {
@@ -505 +519 @@
                         }
                         break;
+#ifdef S_IFIFO
                 case S_IFIFO:
+#endif
                         if (Rflag) {
                                 if (copy_fifo(curr->fts_statp, !dne))
@@ -522 +538 @@
                         (void)printf("%s -> %s\n", curr->fts_path, to.p_path);
         }
-        if (errno) {
-                fprintf(stderr, "%s: fts_read: %s\n", argv0, strerror(errno));
-        }
+        if (errno)
+                return err(1, "fts_read");
         return (rval);
 }

trunk/src/gmake/kmkbuiltin/cp_extern.h

@@ -53 +53 @@
 extern volatile sig_atomic_t info;
 
-__BEGIN_DECLS
 int     copy_fifo(struct stat *, int);
 int     copy_file(const FTSENT *, int);
@@ -59 +58 @@
 int     copy_special(struct stat *, int);
 int     setfile(struct stat *, int);
-void    usage(void);
-__END_DECLS
+int     usage(void);

trunk/src/gmake/kmkbuiltin/cp_utils.c

@@ -31 +31 @@
 #if 0
 static char sccsid[] = "@(#)utils.c     8.3 (Berkeley) 4/1/94";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $");
 #endif
 #endif /* not lint */
-#include <sys/cdefs.h>
-//__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $");
-
+
+#ifndef _MSC_VER
 #include <sys/param.h>
+#endif 
 #include <sys/stat.h>
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
@@ -42 +44 @@
 #endif
 
-#include <err.h>
+#include "err.h"
 #include <errno.h>
 #include <fcntl.h>
+#ifndef _MSC_VER
 #include <fts.h>
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <signal.h>
+#ifndef _MSC_VER
 #include <sysexits.h>
 #include <unistd.h>
-#include <signal.h>
+#else
+#include "mscfakes.h"
+#include "ftsfake.h"
+#endif 
 
 #include "cp_extern.h"
@@ -57 +66 @@
 
 #ifndef MAXBSIZE
-#define MAXBSIZE (128*1024)
+# define MAXBSIZE 16384
 #endif
 #ifndef O_BINARY
 # define O_BINARY 0
 #endif
+
+#ifndef S_ISVTX
+# define S_ISVTX 0
+#endif 
 
 int
@@ -78 +91 @@
 
         if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
-                fprintf(stderr, "%s: %s: %s\n", argv0, entp->fts_path, strerror(errno));
+                warn("%s", entp->fts_path);
                 return (1);
         }
@@ -125 +138 @@
 
         if (to_fd == -1) {
-                fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
+                warn("%s", to.p_path);
                 (void)close(from_fd);
                 return (1);
@@ -142 +155 @@
                 if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
                     MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
-                        fprintf(stderr, "%s: %s: %s\n", argv0, entp->fts_path, strerror(errno));
+                        warn("%s", entp->fts_path);
                         rval = 1;
                 } else {
@@ -162 +175 @@
                         }
                         if (wcount != (ssize_t)wresid) {
-                                fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
+                                warn("%s", to.p_path);
                                 rval = 1;
                         }
                         /* Some systems don't unmap on close(2). */
                         if (munmap(p, fs->st_size) < 0) {
-                                fprintf(stderr, "%s: %s: %s\n", entp->fts_path, strerror(errno));
+                                warn("%s", entp->fts_path);
                                 rval = 1;
                         }
@@ -192 +205 @@
                         }
                         if (wcount != (ssize_t)wresid) {
-                                fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
+                                warn("%s", to.p_path);
                                 rval = 1;
                                 break;
@@ -198 +211 @@
                 }
                 if (rcount < 0) {
-                        fprintf(stderr, "%s: %s: %s\n", argv0, entp->fts_path, strerror(errno));
+                        warn("%s", entp->fts_path);
                         rval = 1;
                 }
@@ -214 +227 @@
         (void)close(from_fd);
         if (close(to_fd)) {
-                fprintf(stderr, "%s: %s: %s\n", argv0, to.p_path, strerror(errno));
+                warn("%s", to.p_path);
                 rval = 1;
         }
@@ -227 +240 @@
 
         if ((len = readlink(p->fts_path, llink, sizeof(llink) - 1)) == -1) {
-                fprintf(stderr, "%s: readlink: %s: %s\n", argv0, p->fts_path, strerror(errno));
+                warn("readlink: %s", p->fts_path);
                 return (1);
         }
         llink[len] = '\0';
         if (exists && unlink(to.p_path)) {
-                fprintf(stderr, "%s: unlink: %s: %s\n", argv0, to.p_path, strerror(errno));
+                warn("unlink: %s", to.p_path);
                 return (1);
         }
         if (symlink(llink, to.p_path)) {
-                fprintf(stderr, "%s: symlink: %s: %s\n", argv0, llink, strerror(errno));
+                warn("symlink: %s", llink);
                 return (1);
         }
@@ -246 +259 @@
 {
         if (exists && unlink(to.p_path)) {
-                fprintf(stderr, "%s: unlink: %s: %s\n", argv0, to.p_path, strerror(errno));
+                warn("unlink: %s", to.p_path);
                 return (1);
         }
         if (mkfifo(to.p_path, from_stat->st_mode)) {
-                fprintf(stderr, "%s: mkfifo: %s\n", argv0, to.p_path, strerror(errno));
+                warn("mkfifo: %s", to.p_path);
                 return (1);
         }
@@ -260 +273 @@
 {
         if (exists && unlink(to.p_path)) {
-                fprintf(stderr, "%s: unlink: %s: %s\n", argv0, to.p_path, strerror(errno));
+                warn("unlink: %s", to.p_path);
                 return (1);
         }
         if (mknod(to.p_path, from_stat->st_mode, from_stat->st_rdev)) {
-                fprintf(stderr, "%s: mknod: %s: %s\n", argv0, to.p_path, strerror(errno));
+                warn("mknod: %s", to.p_path);
                 return (1);
         }
@@ -292 +305 @@
 #endif
         if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
-                fprintf(stderr, "%s: %sutimes: %s: %s\n", argv0, islink ? "l" : "", to.p_path, strerror(errno));
+                warn("%sutimes: %s", islink ? "l" : "", to.p_path);
                 rval = 1;
         }
@@ -314 +327 @@
                     chown(to.p_path, fs->st_uid, fs->st_gid))) {
                         if (errno != EPERM) {
-                                fprintf(stderr, "%s: chown: %s: %s\n", argv0, to.p_path, strerror(errno));
+                                warn("chown: %s", to.p_path);
                                 rval = 1;
                         }
@@ -324 +337 @@
                     (islink ? lchmod(to.p_path, fs->st_mode) :
                     chmod(to.p_path, fs->st_mode))) {
-                        fprintf(stderr, "%s: chmod: %s: %s\n", to.p_path, strerror(errno));
+                        warn("chmod: %s", to.p_path);
                         rval = 1;
                 }
@@ -334 +347 @@
                     (islink ? (errno = ENOSYS) :
                     chflags(to.p_path, fs->st_flags))) {
-                        fprintf(stderr, "%s: chflags: %s: %s", argv0, to.p_path, strerror(errno));
+                        warn("chflags: %s", to.p_path);
                         rval = 1;
                 }
@@ -342 +355 @@
 }
 
-void
+int
 usage(void)
 {
@@ -349 +362 @@
 "usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-pv] src target",
 "       cp [-R [-H | -L | -P]] [-f | -i | -n] [-pv] src1 ... srcN directory");
-        exit(EX_USAGE);
-}
+        return EX_USAGE;
+}

trunk/src/gmake/kmkbuiltin/echo.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)echo.c      8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
+#include <sys/cdefs.h>
+//__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.17 2004/04/06 20:06:46 markm Exp $");
 #endif
-#ifndef _MSC_VER
-#include <sys/cdefs.h>
-#endif 
-//__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.17 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/types.h>
@@ -57 +55 @@
 #ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
 #endif 
 
@@ -63 +63 @@
 #endif
 
-#ifdef _MSC_VER
-#include <io.h>
-
-struct iovec {
-    char *iov_base;
-    size_t iov_len;
-};
-
-int writev(int fd, const struct iovec *vector, int count)
-{
-    int size = 0;
-    int i;
-    for (i = 0; i < count; i++)
-    {
-        int cb = write(fd, vector[i].iov_base, vector[i].iov_len);
-        if (cb < 0)
-            return -1;
-        size += cb;
-    }
-    return size;
-}
-
-#define STDERR_FILENO 2
-#define STDOUT_FILENO 1
-#endif /* _MSC_VER */
 
 /*
@@ -127 +102 @@
         if ((iovfree = vp = iov = malloc((veclen + 1) * sizeof(struct iovec))) == NULL) {
                 errexit(progname, "malloc");
-                return 1;
+                exit(1);
         }
 

trunk/src/gmake/kmkbuiltin/install.c

@@ -42 +42 @@
 static char sccsid[] = "@(#)xinstall.c  8.1 (Berkeley) 7/21/93";
 #endif /* not lint */
-#endif
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.66 2005/01/25 14:34:57 ssouhlal Exp $");
-
+#endif
+
+#ifndef _MSC_VER
 #include <sys/param.h>
+#ifdef USE_MMAP
 #include <sys/mman.h>
+#endif 
 #include <sys/mount.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#else
+#include <process.h>
+#endif
 #include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
 
 #include <ctype.h>
-#include <err.h>
+#include "err.h"
 #include <errno.h>
 #include <fcntl.h>
+#ifndef _MSC_VER
 #include <grp.h>
 #include <paths.h>
 #include <pwd.h>
+#endif 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <sysexits.h>
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif 
+
+extern void * setmode(const char *p);
+extern mode_t getmode(const void *bbox, mode_t omode);
+
+#ifndef __unused
+# define __unused
+#endif 
+
+#ifndef MAXBSIZE
+# define MAXBSIZE 16384
+#endif 
 
 /* Bootstrap aid - this doesn't exist in most older releases */
@@ -83 +106 @@
 #endif
 
-static struct passwd *pp;
-static struct group *gp;
 static gid_t gid;
 static uid_t uid;
@@ -91 +112 @@
 static const char *suffix = BACKUP_SUFFIX;
 
-static void     copy(int, const char *, int, const char *, off_t);
+static int      copy(int, const char *, int, const char *, off_t);
 static int      compare(int, const char *, size_t, int, const char *, size_t);
 static int      create_newfile(const char *, int, struct stat *);
 static int      create_tempfile(const char *, char *, size_t);
-static void     install(const char *, const char *, u_long, u_int);
-static void     install_dir(char *);
+static int      install(const char *, const char *, u_long, u_int);
+static int      install_dir(char *);
 static u_long   numeric_id(const char *, const char *);
-static void     strip(const char *);
+static int      strip(const char *);
+#ifdef USE_MMAP
 static int      trymmap(int);
-static void     usage(void);
+#endif 
+static int      usage(void);
 
 int
@@ -107 +130 @@
         struct stat from_sb, to_sb;
         mode_t *set;
-        u_long fset;
+        u_long fset = 0;
         int ch, no_target;
         u_int iflags;
@@ -132 +155 @@
                         dodir = 1;
                         break;
-                    case 'f':
+                case 'f':
 #ifdef UF_IMMUTABLE
                         flags = optarg;
                         if (strtofflags(&flags, &fset, NULL))
-                                errx(EX_USAGE, "%s: invalid flag", flags);
+                                return errx(EX_USAGE, "%s: invalid flag", flags);
                         iflags |= SETFLAGS;
+#else   
+                        (void)flags;
 #endif
                         break;
@@ -152 +177 @@
                         if (!(set = setmode(optarg)))
 #endif
-                                errx(EX_USAGE, "invalid file mode: %s",
-                                     optarg);
+                                return errx(EX_USAGE, "invalid file mode: %s",
+                                            optarg);
                         mode = getmode(set, 0);
                         free(set);
@@ -174 +199 @@
                 case '?':
                 default:
-                        usage();
+                        return usage();
                 }
         argc -= optind;
@@ -182 +207 @@
         if (dostrip && dodir) {
                 warnx("-d and -s may not be specified together");
-                usage();
+                return usage();
         }
 
         /* must have at least two arguments, except when creating directories */
         if (argc == 0 || (argc == 1 && !dodir))
-                usage();
+                return usage();
 
         /* need to make a temp copy so we can compare stripped version */
@@ -195 +220 @@
         /* get group and owner id's */
         if (group != NULL) {
+#ifndef _MSC_VER
+                struct group *gp;
                 if ((gp = getgrnam(group)) != NULL)
                         gid = gp->gr_gid;
                 else
+#endif 
+                {
                         gid = (gid_t)numeric_id(group, "group");
+                        if (gid == (gid_t)-1)
+                                return 1;
+                }
         } else
                 gid = (gid_t)-1;
 
         if (owner != NULL) {
+#ifndef _MSC_VER
+                struct passwd *pp;
                 if ((pp = getpwnam(owner)) != NULL)
                         uid = pp->pw_uid;
                 else
+#endif 
+                {
                         uid = (uid_t)numeric_id(owner, "user");
+                        if (uid == (uid_t)-1)
+                                return 1;
+                }
         } else
                 uid = (uid_t)-1;
 
         if (dodir) {
-                for (; *argv != NULL; ++argv)
-                        install_dir(*argv);
-                exit(EX_OK);
+                for (; *argv != NULL; ++argv) {
+                        int rc = install_dir(*argv);
+                        if (rc)
+                                return rc;
+                }
+                return EX_OK;
                 /* NOTREACHED */
         }
@@ -219 +261 @@
         no_target = stat(to_name = argv[argc - 1], &to_sb);
         if (!no_target && S_ISDIR(to_sb.st_mode)) {
-                for (; *argv != to_name; ++argv)
-                        install(*argv, to_name, fset, iflags | DIRECTORY);
-                exit(EX_OK);
-                /* NOTREACHED */
+                for (; *argv != to_name; ++argv) {
+                        int rc = install(*argv, to_name, fset, iflags | DIRECTORY);
+                        if (rc)
+                                return rc;
+                }
+                return EX_OK;
         }
 
@@ -228 +272 @@
         if (argc != 2) {
                 warnx("wrong number or types of arguments");
-                usage();
+                return usage();
         }
 
         if (!no_target) {
                 if (stat(*argv, &from_sb))
-                        err(EX_OSERR, "%s", *argv);
+                        return err(EX_OSERR, "%s", *argv);
                 if (!S_ISREG(to_sb.st_mode)) {
                         errno = EFTYPE;
-                        err(EX_OSERR, "%s", to_name);
+                        return err(EX_OSERR, "%s", to_name);
                 }
                 if (to_sb.st_dev == from_sb.st_dev &&
-                    to_sb.st_ino == from_sb.st_ino)
-                        errx(EX_USAGE,
-                            "%s and %s are the same file", *argv, to_name);
-        }
-        install(*argv, to_name, fset, iflags);
-        exit(EX_OK);
-        /* NOTREACHED */
-}
-
-u_long
+                    to_sb.st_dev != 0 &&
+                    to_sb.st_ino == from_sb.st_ino &&
+                    to_sb.st_ino != 0)
+                        return errx(EX_USAGE,
+                                    "%s and %s are the same file", *argv, to_name);
+        }
+        return install(*argv, to_name, fset, iflags);
+}
+
+static u_long
 numeric_id(const char *name, const char *type)
 {
@@ -261 +305 @@
         val = strtoul(name, &ep, 10);
         if (errno)
-                err(EX_NOUSER, "%s", name);
+                return err(-1, "%s", name);
         if (*ep != '\0')
-                errx(EX_NOUSER, "unknown %s %s", type, name);
+                return errx(-1, "unknown %s %s", type, name);
         return (val);
 }
@@ -271 +315 @@
  *      build a path name and install the file
  */
-void
+static int
 install(const char *from_name, const char *to_name, u_long fset, u_int flags)
 {
@@ -279 +323 @@
         int tempcopy, temp_fd, to_fd;
         char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN];
+        int rc = EX_OK;
 
         files_match = 0;
         from_fd = -1;
         to_fd = -1;
+        temp_fd = -1;
 
         /* If try to install NULL file to a directory, fails. */
-        if (flags & DIRECTORY || strcmp(from_name, _PATH_DEVNULL)) {
+        if (flags & DIRECTORY 
+#if defined(__EMX__) || defined(_MSC_VER)
+            || (   stricmp(from_name, _PATH_DEVNULL)
+                && stricmp(from_name, "nul")
+#ifdef __EMX__
+                && stricmp(from_name, "/dev/nul")
+#endif 
+               )
+#else
+            || strcmp(from_name, _PATH_DEVNULL)
+#endif
+            ) {
                 if (stat(from_name, &from_sb))
-                        err(EX_OSERR, "%s", from_name);
+                        return err(EX_OSERR, "%s", from_name);
                 if (!S_ISREG(from_sb.st_mode)) {
                         errno = EFTYPE;
-                        err(EX_OSERR, "%s", from_name);
+                        return err(EX_OSERR, "%s", from_name);
                 }
                 /* Build the target path. */
@@ -310 +367 @@
                 errno = EFTYPE;
                 warn("%s", to_name);
-                return;
+                return EX_OK;
         }
 
@@ -317 +374 @@
 
         if (!devnull && (from_fd = open(from_name, O_RDONLY | O_BINARY, 0)) < 0)
-                err(EX_OSERR, "%s", from_name);
+                return err(EX_OSERR, "%s", from_name);
 
         /* If we don't strip, we can compare first. */
         if (docompare && !dostrip && target) {
-                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0)
-                        err(EX_OSERR, "%s", to_name);
+                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0) {
+                        rc = err(EX_OSERR, "%s", to_name);
+                        goto l_done;
+                }
                 if (devnull)
                         files_match = to_sb.st_size == 0;
@@ -331 +390 @@
 
                 /* Close "to" file unless we match. */
-                if (!files_match)
+                if (!files_match) {
                         (void)close(to_fd);
+                        to_fd = -1;
+                }
         }
 
@@ -339 +400 @@
                         to_fd = create_tempfile(to_name, tempfile,
                             sizeof(tempfile));
-                        if (to_fd < 0)
-                                err(EX_OSERR, "%s", tempfile);
+                        if (to_fd < 0) {
+                                rc = err(EX_OSERR, "%s", tempfile);
+                                goto l_done;
+                        }
                 } else {
                         if ((to_fd = create_newfile(to_name, target,
-                            &to_sb)) < 0)
-                                err(EX_OSERR, "%s", to_name);
+                            &to_sb)) < 0) {
+                                rc = err(EX_OSERR, "%s", to_name);
+                                goto l_done;
+                        }
                         if (verbose)
                                 (void)printf("install: %s -> %s\n",
                                     from_name, to_name);
                 }
-                if (!devnull)
-                        copy(from_fd, from_name, to_fd,
-                             tempcopy ? tempfile : to_name, from_sb.st_size);
+                if (!devnull) {
+                        rc = copy(from_fd, from_name, to_fd,
+                                  tempcopy ? tempfile : to_name, from_sb.st_size);
+                        if (rc)
+                                goto l_done;
+                }
         }
 
         if (dostrip) {
-                strip(tempcopy ? tempfile : to_name);
+#if defined(__EMX__) || defined(_MSC_VER) 
+                /* close before we strip. */
+                close(to_fd);
+                to_fd = -1;
+#endif 
+                rc = strip(tempcopy ? tempfile : to_name);
+                if (rc)
+                        goto l_done;
 
                 /*
@@ -361 +436 @@
                  * that does not work in-place -- like GNU binutils strip.
                  */
+#if !defined(__EMX__) && !defined(_MSC_VER) 
                 close(to_fd);
+#endif 
                 to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY | O_BINARY, 0);
-                if (to_fd < 0)
-                        err(EX_OSERR, "stripping %s", to_name);
+                if (to_fd < 0) {
+                        rc = err(EX_OSERR, "stripping %s", to_name);
+                        goto l_done;
+                }
         }
 
@@ -374 +453 @@
 
                 /* Re-open to_fd using the real target name. */
-                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0)
-                        err(EX_OSERR, "%s", to_name);
+                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0) {
+                        rc = err(EX_OSERR, "%s", to_name);
+                        goto l_done;
+                }
 
                 if (fstat(temp_fd, &temp_sb)) {
@@ -381 +462 @@
                         (void)unlink(tempfile);
                         errno = serrno;
-                        err(EX_OSERR, "%s", tempfile);
+                        rc = err(EX_OSERR, "%s", tempfile);
+                        goto l_done;
                 }
 
@@ -391 +473 @@
                          * Need to preserve target file times, though.
                          */
+#if !defined(_MSC_VER) && !defined(__EMX__)
                         if (to_sb.st_nlink != 1) {
                                 tvb[0].tv_sec = to_sb.st_atime;
@@ -397 +480 @@
                                 tvb[1].tv_usec = 0;
                                 (void)utimes(tempfile, tvb);
-                        } else {
+                        } else 
+#endif
+                        {
+
                                 files_match = 1;
                                 (void)unlink(tempfile);
                         }
                         (void) close(temp_fd);
+                        temp_fd = -1;
                 }
         }
@@ -419 +506 @@
                             suffix) != strlen(to_name) + strlen(suffix)) {
                                 unlink(tempfile);
-                                errx(EX_OSERR, "%s: backup filename too long",
-                                    to_name);
+                                rc = errx(EX_OSERR, "%s: backup filename too long",
+                                          to_name);
+                                goto l_done;
                         }
                         if (verbose)
@@ -428 +516 @@
                                 unlink(tempfile);
                                 errno = serrno;
-                                err(EX_OSERR, "rename: %s to %s", to_name,
-                                     backup);
+                                rc = err(EX_OSERR, "rename: %s to %s", to_name,
+                                         backup);
+                                goto l_done;
                         }
                 }
@@ -438 +527 @@
                         unlink(tempfile);
                         errno = serrno;
-                        err(EX_OSERR, "rename: %s to %s",
-                            tempfile, to_name);
+                        rc = err(EX_OSERR, "rename: %s to %s",
+                                 tempfile, to_name);
+                        goto l_done;
                 }
 
                 /* Re-open to_fd so we aren't hosed by the rename(2). */
                 (void) close(to_fd);
-                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0)
-                        err(EX_OSERR, "%s", to_name);
+                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0) {
+                        rc = err(EX_OSERR, "%s", to_name);
+                        goto l_done;
+                }
         }
 
@@ -463 +555 @@
                 (void)unlink(to_name);
                 errno = serrno;
-                err(EX_OSERR, "%s", to_name);
+                rc = err(EX_OSERR, "%s", to_name);
+                goto l_done;
         }
 
@@ -486 +579 @@
                         (void)unlink(to_name);
                         errno = serrno;
-                        err(EX_OSERR,"%s: chown/chgrp", to_name);
+                        rc = err(EX_OSERR,"%s: chown/chgrp", to_name);
+                        goto l_done;
                 }
 
@@ -494 +588 @@
                         (void)unlink(to_name);
                         errno = serrno;
-                        err(EX_OSERR, "%s: chmod", to_name);
+                        rc = err(EX_OSERR, "%s: chmod", to_name);
+                        goto l_done;
                 }
 
@@ -516 +611 @@
                                 (void)unlink(to_name);
                                 errno = serrno;
-                                err(EX_OSERR, "%s: chflags", to_name);
-                        }
-                }
-        }
-#endif
-
-        (void)close(to_fd);
+                                rc = err(EX_OSERR, "%s: chflags", to_name);
+                                goto l_done;
+                        }
+                }
+        }
+#endif
+
+l_done:
+        if (to_fd >= 0)
+                (void)close(to_fd);
+        if (temp_fd >= 0)
+                (void)close(temp_fd);
         if (!devnull)
                 (void)close(from_fd);
+        return rc;
 }
 
@@ -531 +632 @@
  *      compare two files; non-zero means files differ
  */
-int
+static int
 compare(int from_fd, const char *from_name __unused, size_t from_len,
         int to_fd, const char *to_name __unused, size_t to_len)
@@ -544 +645 @@
 
         if (from_len <= MAX_CMP_SIZE) {
-#if !defined(__EMX__) && !defined(_MSC_VER)
+#ifdef USE_MMAP
                 done_compare = 0;
                 if (trymmap(from_fd) && trymmap(to_fd)) {
@@ -561 +662 @@
                         done_compare = 1;
                 }
-#endif
         out:
+#else
+        (void)p; (void)q;
+        done_compare = 0;
+#endif
                 if (!done_compare) {
                         char buf1[MAXBSIZE];
@@ -637 +741 @@
                 if (dobackup) {
                         if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s",
-                            path, suffix) != strlen(path) + strlen(suffix))
+                            path, suffix) != strlen(path) + strlen(suffix)) {
                                 errx(EX_OSERR, "%s: backup filename too long",
-                                    path);
+                                     path);
+                                errno = ENAMETOOLONG;
+                                return -1;
+                        }
                         (void)snprintf(backup, MAXPATHLEN, "%s%s",
                             path, suffix);
@@ -645 +752 @@
                                 (void)printf("install: %s -> %s\n",
                                     path, backup);
-                        if (rename(path, backup) < 0)
+                        if (rename(path, backup) < 0) {
                                 err(EX_OSERR, "rename: %s to %s", path, backup);
+                                return -1;
+                        }
                 } else
                         if (unlink(path) < 0)
@@ -662 +771 @@
  *      copy from one file to another
  */
-void
+static int
 copy(int from_fd, const char *from_name, int to_fd, const char *to_name,
     off_t size)
@@ -673 +782 @@
         /* Rewind file descriptors. */
         if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1)
-                err(EX_OSERR, "lseek: %s", from_name);
+                return err(EX_OSERR, "lseek: %s", from_name);
         if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1)
-                err(EX_OSERR, "lseek: %s", to_name);
+                return err(EX_OSERR, "lseek: %s", to_name);
 
         /*
@@ -683 +792 @@
          */
         done_copy = 0;
-#if !defined(__EMX__) && !defined(_MSC_VER)
+#ifdef USE_MMAP
         if (size <= 8 * 1048576 && trymmap(from_fd) &&
             (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED,
@@ -695 +804 @@
                 done_copy = 1;
         }
+#else
+        (void)p;
 #endif
         if (!done_copy) {
@@ -702 +813 @@
                                 (void)unlink(to_name);
                                 errno = nw > 0 ? EIO : serrno;
-                                err(EX_OSERR, "%s", to_name);
+                                return err(EX_OSERR, "%s", to_name);
                         }
                 if (nr != 0) {
@@ -708 +819 @@
                         (void)unlink(to_name);
                         errno = serrno;
-                        err(EX_OSERR, "%s", from_name);
-                }
-        }
+                        return err(EX_OSERR, "%s", from_name);
+                }
+        }
+        return EX_OK;
 }
 
@@ -717 +829 @@
  *      use strip(1) to strip the target file
  */
-void
+static int
 strip(const char *to_name)
 {
+#if defined(__EMX__) || defined(_MSC_VER)
+        const char *stripbin = getenv("STRIPBIN");
+        if (stripbin == NULL)
+                stripbin = "strip";
+        return spawnlp(P_WAIT, stripbin, stripbin, to_name, NULL);
+#else
         const char *stripbin;
         int serrno, status;
@@ -743 +861 @@
                 }
         }
+#endif 
 }
 
@@ -749 +868 @@
  *      build directory heirarchy
  */
-void
+static int
 install_dir(char *path)
 {
@@ -762 +881 @@
                         if (stat(path, &sb)) {
                                 if (errno != ENOENT || mkdir(path, 0755) < 0) {
-                                        err(EX_OSERR, "mkdir %s", path);
+                                        return err(EX_OSERR, "mkdir %s", path);
                                         /* NOTREACHED */
                                 } else if (verbose)
@@ -768 +887 @@
                                                      path);
                         } else if (!S_ISDIR(sb.st_mode))
-                                errx(EX_OSERR, "%s exists but is not a directory", path);
+                                return errx(EX_OSERR, "%s exists but is not a directory", path);
                         if (!(*p = ch))
                                 break;
@@ -777 +896 @@
         if (chmod(path, mode))
                 warn("chmod %o %s", mode, path);
+        return EX_OK;
 }
 
@@ -783 +903 @@
  *      print a usage message and die
  */
-void
+static int 
 usage()
 {
@@ -792 +912 @@
 "               [-o owner] file1 ... fileN directory\n"
 "       install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n");
-        exit(EX_USAGE);
-        /* NOTREACHED */
-}
-
+        return EX_USAGE;
+}
+
+#ifdef USE_MMAP
 /*
  * trymmap --
  *      return true (1) if mmap should be tried, false (0) if not.
  */
-int
+static int
 trymmap(int fd)
 {
@@ -818 +938 @@
         return (0);
 }
+#endif 

trunk/src/gmake/kmkbuiltin/ln.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)ln.c        8.2 (Berkeley) 3/31/94";
 #endif /* not lint */
-#endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $");
-
+#endif /* no $id */
+
+#ifndef _MSC_VER
 #include <sys/param.h>
+#endif 
 #include <sys/stat.h>
 
-#include <err.h>
+#include "err.h"
 #include <errno.h>
 #include <limits.h>
@@ -51 +53 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif 
 
 static int      fflag;                          /* Unlink existing files. */
@@ -63 +69 @@
 
 static int      linkit(const char *, const char *, int);
-static void     usage(void);
+static int      usage(void);
+
 
 int
@@ -72 +79 @@
         int ch, exitval;
 
+        /* kmk: reset getopt() and set program name. */
+        g_progname = argv[0];
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+#if defined(__FreeBSD__) || defined(__EMX__)
+        optreset = 1;
+        optind = 1;
+#else
+        optind = 0; /* init */
+#endif 
+
+#if 0 /* kmk: we don't need this. */
         /*
          * Test for the special case where the utility is called as
@@ -83 +103 @@
         if (strcmp(p, "link") == 0) {
                 while (getopt(argc, argv, "") != -1)
-                        usage();
+                        return usage();
                 argc -= optind;
                 argv += optind;
                 if (argc != 2)
-                        usage();
+                        return usage();
                 linkf = link;
-                exit(linkit(argv[0], argv[1], 0));
-        }
+                return linkit(argv[0], argv[1], 0);
+        }
+#else
+        (void)p;
+#endif
+        
 
         while ((ch = getopt(argc, argv, "fhinsv")) != -1)
@@ -114 +138 @@
                 case '?':
                 default:
-                        usage();
+                        return usage();
                 }
 
@@ -125 +149 @@
         switch(argc) {
         case 0:
-                usage();
+                return usage();
                 /* NOTREACHED */
         case 1:                         /* ln target */
-                exit(linkit(argv[0], ".", 1));
+                return linkit(argv[0], ".", 1);
         case 2:                         /* ln target source */
-                exit(linkit(argv[0], argv[1], 0));
+                return linkit(argv[0], argv[1], 0);
         default:
                 ;
@@ -142 +166 @@
                  */
                 errno = ENOTDIR;
-                err(1, "%s", sourcedir);
+                return err(1, "%s", sourcedir);
         }
         if (stat(sourcedir, &sb))
-                err(1, "%s", sourcedir);
+                return err(1, "%s", sourcedir);
         if (!S_ISDIR(sb.st_mode))
-                usage();
+                return usage();
         for (exitval = 0; *argv != sourcedir; ++argv)
                 exitval |= linkit(*argv, sourcedir, 1);
-        exit(exitval);
+        return exitval;
 }
 
-int
+static int
 linkit(const char *target, const char *source, int isdir)
 {
@@ -233 +257 @@
 }
 
-void
+static int
 usage(void)
 {
@@ -240 +264 @@
             "       ln [-fhinsv] source_file ... target_dir",
             "       link source_file target_file");
-        exit(1);
+        return 1;
 }

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) {

trunk/src/gmake/kmkbuiltin/rm.c

@@ -38 +38 @@
 static char sccsid[] = "@(#)rm.c        8.5 (Berkeley) 4/18/94";
 #endif /* not lint */
-#endif
 #include <sys/cdefs.h>
 //__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.47 2004/04/06 20:06:50 markm Exp $");
+#endif
 
 #include <sys/stat.h>
+#ifndef _MSC_VER
 #include <sys/param.h>
 #include <sys/mount.h>
-
-#include <err.h>
+#endif 
+
+#include "err.h"
 #include <errno.h>
 #include <fcntl.h>
+#ifdef DO_RMTREE
 #include <fts.h>
+#endif 
+#ifndef _MSC_VER
 #include <grp.h>
 #include <pwd.h>
+#endif 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <sysexits.h>
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif
 
 #ifdef __EMX__
@@ -81 +91 @@
 static void     rm_file(char **);
 static int      rm_overwrite(char *, struct stat *);
+#ifdef DO_RMTREE
 static void     rm_tree(char **);
+#endif
 static int      usage(void);
 
@@ -100 +112 @@
         dflag = eval = fflag = iflag = Pflag = vflag = Wflag = stdin_ok = 0;
         uid = 0;
+        /* kmk: reset getopt and set program name. */
+        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -110 +124 @@
 #endif
 
+#if 0 /* kmk: we don't need this */
         /*
          * Test for the special case where the utility is called as
@@ -129 +144 @@
                 return eval;
         }
-
+#else   
+        (void)p;
+#endif 
         Pflag = rflag = 0;
         while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1)
@@ -149 +166 @@
                 case 'R':
                 case 'r':                       /* Compatibility. */
+#ifdef DO_RMTREE
                         rflag = 1;
                         break;
+#else
+                        errno = EINVAL;
+                        return err(1, "Recursion is not supported!");
+#endif
                 case 'v':
                         vflag = 1;
@@ -176 +198 @@
         if (*argv) {
                 stdin_ok = isatty(STDIN_FILENO);
-
+#ifdef DO_RMTREE
                 if (rflag)
                         rm_tree(argv);
                 else
+#endif
                         rm_file(argv);
         }
@@ -186 +209 @@
 }
 
+#ifdef DO_RMTREE
 static void
 rm_tree(char **argv)
@@ -214 +238 @@
                 flags |= FTS_WHITEOUT;
 #endif
-        if (!(fts = fts_open(argv, flags, NULL)))
-                err(1, "fts_open");
+        if (!(fts = fts_open(argv, flags, NULL))) {
+                eval = err(1, "fts_open");
+                return;
+        }
         while ((p = fts_read(fts)) != NULL) {
                 switch (p->fts_info) {
@@ -226 +252 @@
                         continue;
                 case FTS_ERR:
-                        errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
+                        eval = errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
+                        return;
                 case FTS_NS:
                         /*
@@ -318 +345 @@
                                                 continue;
                                 rval = unlink(p->fts_accpath);
+#ifdef _MSC_VER
+                                if (rval != 0) {
+                                        chmod(p->fts_accpath, 0777);
+                                        rval = unlink(p->fts_accpath);
+                                }
+#endif 
+
                                 if (rval == 0 || (fflag && errno == ENOENT)) {
                                         if (rval == 0 && vflag)
@@ -335 +369 @@
         }
 }
+#endif /* DO_RMTREE */
 
 static void
@@ -395 +430 @@
                                                 continue;
                                 rval = unlink(f);
+#ifdef _MSC_VER
+                                if (rval != 0) {
+                                        chmod(f, 0777);
+                                        rval = unlink(f);
+                                }
+#endif 
                         }
                 }
@@ -448 +489 @@
 #endif
         if ((buf = malloc(bsize)) == NULL)
-                err(1, "%s: malloc", file);
+                exit(err(1, "%s: malloc", file));
 
 #define PASS(byte) {                                                    \
@@ -512 +553 @@
 #ifdef SF_APPEND
                 if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
-                        err(1, "fflagstostr");
+                        exit(err(1, "fflagstostr"));
                 (void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
                     modep + 1, modep[9] == ' ' ? "" : " ",
@@ -521 +562 @@
                 free(flagsp);
 #else
+                (void)flagsp;
                 (void)fprintf(stderr, "override %s%s %d/%d for %s? ",
                     modep + 1, modep[9] == ' ' ? "" : " ",

trunk/src/gmake/kmkbuiltin/setmode.c

@@ -37 +37 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)setmode.c   8.2 (Berkeley) 3/25/94";
+#include <sys/cdefs.h>
+//__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.9 2003/02/23 00:24:03 mikeh Exp $");
 #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 $");
 
 //#include "namespace.h"
@@ -53 +51 @@
 #ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
 #endif 
 
@@ -59 +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 */

trunk/src/gmake/kmkbuiltin/strlcpy.c

@@ -30 +30 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $");
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 //__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.7 2003/05/01 19:03:14 nectar Exp $");
+#endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

trunk/src/gmake/kmkbuiltin/strmode.c

@@ -34 +34 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strmode.c   8.3 (Berkeley) 8/15/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 //__FBSDID("$FreeBSD: src/lib/libc/string/strmode.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
+#endif /* LIBC_SCCS and not lint */
+
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
+#ifdef _MSC_VER
+#include "mscfakes.h"
+#endif 
 
 void
@@ -55 +59 @@
                 *p++ = 'c';
                 break;
+#ifdef S_IFBLK
         case S_IFBLK:                   /* block special */
                 *p++ = 'b';
                 break;
+#endif 
         case S_IFREG:                   /* regular */
                 *p++ = '-';
                 break;
+#ifndef _MSC_VER
         case S_IFLNK:                   /* symbolic link */
                 *p++ = 'l';
                 break;
+#endif
+#ifdef S_IFSOCK
         case S_IFSOCK:                  /* socket */
                 *p++ = 's';
                 break;
+#endif 
 #ifdef S_IFIFO
         case S_IFIFO:                   /* fifo */
@@ -136 +146 @@
         else
                 *p++ = '-';
+#ifdef S_ISVTX
         switch (mode & (S_IXOTH | S_ISVTX)) {
+#else
+        switch (mode & (S_IXOTH)) {
+#endif
         case 0:
                 *p++ = '-';
@@ -143 +157 @@
                 *p++ = 'x';
                 break;
+#ifdef S_ISVTX
         case S_ISVTX:
                 *p++ = 'T';
@@ -149 +164 @@
                 *p++ = 't';
                 break;
+#endif 
         }
         *p++ = ' ';             /* will be a '+' if ACL's implemented */

trunk/src/gmake/variable.c

@@ -685 +685 @@
 #ifdef CONFIG_WITH_KMK_BUILTIN
   /* The supported kMk Builtin commands. */
-#ifdef _MSC_VER
-  (void) define_variable ("KMK_BUILTIN", 11, "append echo mkdir", o_default, 0);
-#else
   (void) define_variable ("KMK_BUILTIN", 11, "append cp echo install ln mkdir rm", o_default, 0);
-#endif
 #endif