Changeset 370 in kBuild for trunk/src/gmake/kmkbuiltin/echo.c

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. :-)

File:

• trunk/src/gmake/kmkbuiltin/echo.c (modified) (4 diffs)

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);
         }