Changeset 2141 in kBuild for trunk

Timestamp:

Dec 25, 2008 8:21:22 PM (16 years ago)

Author:

bird

Message:

kmk: new function $(printf fmt,arg0,arg1,...).

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• function.c (modified) (2 diffs)
• kmkbuiltin.h (modified) (1 diff)
• kmkbuiltin/printf.c (modified) (11 diffs)

trunk/src/kmk/Makefile.am

@@ -139 +139 @@
         -DCONFIG_WITH_FILE_SIZE \
         -DCONFIG_WITH_WHICH \
+        -DCONFIG_WITH_PRINTF \
         -DCONFIG_WITH_EVALPLUS \
         -DCONFIG_WITH_MINIMAL_STATS \

trunk/src/kmk/Makefile.kmk

@@ -165 +165 @@
         CONFIG_WITH_FILE_SIZE \
         CONFIG_WITH_WHICH \
+        CONFIG_WITH_PRINTF \
         CONFIG_WITH_EVALPLUS \
         CONFIG_WITH_MINIMAL_STATS \

trunk/src/kmk/function.c

@@ -35 +35 @@
 #ifdef KMK_HELPERS
 # include "kbuild.h"
+#endif
+#ifdef CONFIG_WITH_PRINTF
+# include "kmkbuiltin.h"
 #endif
 #ifdef CONFIG_WITH_XARGS /* bird */
@@ -4545 +4548 @@
   { STRING_SIZE_TUPLE("not"),           0,  1,  1,  func_not},
 #endif
+#ifdef CONFIG_WITH_PRINTF
+  { STRING_SIZE_TUPLE("printf"),        1,  0,  1,  kmk_builtin_func_printf},
+#endif
 #ifdef CONFIG_WITH_LAZY_DEPS_VARS
   { STRING_SIZE_TUPLE("deps"),          1,  2,  1,  func_deps},

trunk/src/kmk/kmkbuiltin.h

@@ -54 +54 @@
 extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp);
 
+extern char *kmk_builtin_func_printf(char *o, char **argv, const char *funcname);
+
 extern int kbuild_version(const char *);
 

trunk/src/kmk/kmkbuiltin/printf.c

@@ -46 +46 @@
 #endif*/ /* not lint */
 
-#include "config.h"
+#if !defined(kmk_builtin_printf) && !defined(BUILTIN) && !defined(SHELL)
+# include "../make.h"
+# include "../filedef.h"
+# include "../variable.h"
+#else
+# include "config.h"
+#endif
 #include <sys/types.h>
 
@@ -68 +74 @@
 #endif
 
-#include "kmkbuiltin.h"
+#include "../kmkbuiltin.h"
 
 
@@ -82 +88 @@
 static int      rval;
 static char  **gargv;
+#if !defined(kmk_builtin_printf) && !defined(BUILTIN) && !defined(SHELL)
+static char *g_o = NULL;
+#endif
 static struct option long_options[] =
 {
@@ -90 +99 @@
 
 
+static int       common_printf(int argc, char *argv[]);
 static void      conv_escape_str(char *, void (*)(int));
 static char     *conv_escape(char *, char *);
@@ -105 +115 @@
 static void     b_count(int);
 static void     b_output(int);
+static int      wrap_putchar(int ch);
+static int      wrap_printf(const char *, ...);
 
 #ifdef BUILTIN          /* csh builtin */
@@ -118 +130 @@
         if (fieldwidth != -1) { \
                 if (precision != -1) \
-                        (void)printf(f, fieldwidth, precision, func); \
+                        (void)wrap_printf(f, fieldwidth, precision, func); \
                 else \
-                        (void)printf(f, fieldwidth, func); \
+                        (void)wrap_printf(f, fieldwidth, func); \
         } else if (precision != -1) \
-                (void)printf(f, precision, func); \
+                (void)wrap_printf(f, precision, func); \
         else \
-                (void)printf(f, func); \
+                (void)wrap_printf(f, func); \
 }
 
@@ -141 +153 @@
 int kmk_builtin_printf(int argc, char *argv[], char **envp)
 {
-        char *fmt, *start;
-        int fieldwidth, precision;
-        char nextch;
-        char *format;
+        int rc;
         int ch;
-
-        /* kmk: reinitialize globals */
-        b_length = 0;
-        b_fmt = NULL;
-        rval = 0;
-        gargv = NULL;
 
         /* kmk: reset getopt and set progname */
@@ -182 +185 @@
                 return usage(stderr);
         }
+
+        rc = common_printf(argc, argv);
+        return rc;
+}
+
+#ifndef kmk_builtin_printf
+/* entry point used by function.c $(printf ..,..). */
+char *kmk_builtin_func_printf(char *o, char **argv, const char *funcname)
+{
+        int rc;
+        int argc;
+
+        for (argc = 0; argv[argc] != NULL; argc++)
+                /* nothing */;
+
+        g_o = o;
+        rc = common_printf(argc, argv);
+        o = g_o;
+        g_o = NULL;
+
+        (void)funcname;
+        if (rc != 0)
+                fatal (NILF, _("$(%s): failure rc=%d\n"), rc);
+        return o;
+}
+#endif
+
+static int common_printf(int argc, char *argv[])
+{
+        char *fmt, *start;
+        int fieldwidth, precision;
+        char nextch;
+        char *format;
+        int ch;
+
+        /* kmk: reinitialize globals */
+        b_length = 0;
+        b_fmt = NULL;
+        rval = 0;
+        gargv = NULL;
 
         format = *argv;
@@ -203 +246 @@
                                 char c_ch;
                                 fmt = conv_escape(fmt, &c_ch);
-                                putchar(c_ch);
+                                wrap_putchar(c_ch);
                                 continue;
                         }
                         if (ch != '%' || (*fmt == '%' && ++fmt)) {
-                                (void)putchar(ch);
+                                (void)wrap_putchar(ch);
                                 continue;
                         }
@@ -272 +315 @@
                                 conv_escape_str(cp, b_output);
                                 /* Add any trailing spaces */
-                                printf("%s", b_fmt);
+                                wrap_printf("%s", b_fmt);
                                 break;
                         }
@@ -346 +389 @@
                         return;
                 case ' ':
-                        putchar(' ');
+                        wrap_putchar(' ');
                         break;
                 default:
-                        putchar(ch);
+                        wrap_putchar(ch);
                         return;
                 }
         }
+}
+
+static int wrap_putchar(int ch)
+{
+#ifndef kmk_builtin_printf
+        if (g_o) {
+                char sz[2];
+                sz[0] = ch; sz[1] = '\0';
+                g_o = variable_buffer_output(g_o, sz, 1);
+                return ch;
+        }
+#endif
+        return putchar(ch);
+}
+
+static int wrap_printf(const char * fmt, ...)
+{
+        int rc;
+        va_list va;
+
+#ifndef kmk_builtin_printf
+        if (g_o) {
+                char *str;
+
+                va_start(va, fmt);
+                rc = vasprintf(&str, fmt, va);
+                va_end(va);
+                if (rc >= 0) {
+                        g_o = variable_buffer_output(g_o, str, rc);
+                        free(str);
+                }
+                return rc;
+        }
+#endif
+
+        va_start(va, fmt);
+        rc = vprintf(fmt, va);
+        va_end(va);
+        return rc;
 }