Changeset 775 for trunk/src/gmake/kmkbuiltin/printf.c

Timestamp:

Jan 19, 2007, 6:57:42 AM (19 years ago)

Author:

bird

Message:

ported printf to MSC.

File:

• trunk/src/gmake/kmkbuiltin/printf.c (modified) (14 diffs)

trunk/src/gmake/kmkbuiltin/printf.c

@@ -30 +30 @@
  */
 
-#include <sys/cdefs.h>
+/*#include <sys/cdefs.h>
 #ifndef lint
 #if !defined(BUILTIN) && !defined(SHELL)
@@ -44 +44 @@
 __RCSID("$NetBSD: printf.c,v 1.31 2005/03/22 23:55:46 dsl Exp $");
 #endif
-#endif /* not lint */
+#endif*/ /* not lint */
 
 #include <sys/types.h>
 
 #include <ctype.h>
-#include <err.h>
+#include "err.h"
 #include <errno.h>
+#ifndef _MSC_VER
 #include <inttypes.h>
+#endif
 #include <limits.h>
 #include <locale.h>
@@ -58 +60 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif
 
 #ifdef __GNUC__
@@ -77 +83 @@
 static char     *mklong(const char *, int);
 static void      check_conversion(const char *, const char *);
-static void      usage(void); 
+static void      usage(void);
 
 static void     b_count(int);
@@ -88 +94 @@
 
 #ifdef BUILTIN          /* csh builtin */
-#define main progprintf
+#define kmk_builtin_printf progprintf
 #endif
 
 #ifdef SHELL            /* sh (aka ash) builtin */
-#define main printfcmd
+#define kmk_builtin_printf printfcmd
 #include "../../bin/sh/bltin/bltin.h"
 #endif /* SHELL */
@@ -120 +126 @@
 }
 
-int main(int, char **);
-int main(int argc, char *argv[])
+int kmk_builtin_printf(int argc, char *argv[])
 {
         char *fmt, *start;
@@ -129 +134 @@
         int ch;
 
-#if !defined(SHELL) && !defined(BUILTIN)
+        /* kmk: reinitialize globals */
+        b_length = 0;
+        b_fmt = NULL;
+        rval = 0;
+        gargv = NULL;
+
+        /* kmk: reset getopt and set progname */
+        g_progname = argv[0];
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
+        optreset = 1;
+        optind = 1;
+#else
+        optind = 0; /* init */
+#endif
+
+#if !defined(SHELL) && !defined(BUILTIN) && !defined(kmk_builtin_printf) /* kmk did this already. */
         (void)setlocale (LC_ALL, "");
 #endif
@@ -158 +181 @@
                  * Basic algorithm is to scan the format string for conversion
                  * specifications -- once one is found, find out if the field
-                 * width or precision is a '*'; if it is, gather up value. 
+                 * width or precision is a '*'; if it is, gather up value.
                  * Note, format strings are reused as necessary to use up the
-                 * provided arguments, arguments of zero/null string are 
+                 * provided arguments, arguments of zero/null string are
                  * provided to use up the format string.
                  */
@@ -322 +345 @@
 
 /*
- * Print SysV echo(1) style escape string 
+ * Print SysV echo(1) style escape string
  *      Halts processing string if a \c escape is encountered.
  */
@@ -345 +368 @@
                 }
 
-                /* 
+                /*
                  * %b string octal constants are not like those in C.
-                 * They start with a \0, and are followed by 0, 1, 2, 
-                 * or 3 octal digits. 
+                 * They start with a \0, and are followed by 0, 1, 2,
+                 * or 3 octal digits.
                  */
                 if (ch == '0') {
@@ -390 +413 @@
 
 /*
- * Print "standard" escape characters 
+ * Print "standard" escape characters
  */
 static char *
@@ -519 +542 @@
 {
         static char copy[64];
-        size_t len;     
+        size_t len;
 
         len = strlen(str) + 2;
@@ -530 +553 @@
         copy[len - 2] = ch;
         copy[len - 1] = '\0';
-        return copy;    
+        return copy;
 }
 
@@ -659 +682 @@
 usage(void)
 {
-        (void)fprintf(stderr, "Usage: %s format [arg ...]\n", getprogname());
-}
+        (void)fprintf(stderr, "Usage: %s format [arg ...]\n", g_progname);
+}