Changeset 1121 for trunk/src/kmk

Timestamp:

Sep 25, 2007, 7:57:57 AM (18 years ago)

Author:

bird

Message:

Added $(date ) and $(date-utc ) function as simple wrappers around strftime.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• function.c (modified) (2 diffs)
• variable.c (modified) (3 diffs)

trunk/src/kmk/Makefile.am

@@ -112 +112 @@
         -DCONFIG_WITH_NANOTS \
         -DCONFIG_WITH_SET_CONDITIONALS \
+        -DCONFIG_WITH_DATE \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
         \

trunk/src/kmk/Makefile.kmk

@@ -114 +114 @@
         CONFIG_WITH_NANOTS \
         CONFIG_WITH_SET_CONDITIONALS \
+        CONFIG_WITH_DATE \
         CONFIG_PRETTY_COMMAND_PRINTING \
         \

trunk/src/kmk/function.c

@@ -2673 +2673 @@
 #endif
 
+#ifdef CONFIG_WITH_DATE
+static char *
+func_date (char *o, char **argv, const char *funcname)
+{
+  char *buf;
+  size_t buf_size;
+  time_t tval;
+  const char *format = !strcmp (funcname, "date-utc")
+                     ? "%Y-%m-%dT%H:%M:%SZ" 
+                     : "%Y-%m-%dT%H:%M:%S";
+  if (argv[0]) 
+    {
+      buf = argv[0];
+      while (isspace ((unsigned char)*buf))
+        buf++;
+      if (*buf)
+        format = buf;
+    }
+
+  if (argv[1])
+    {
+      /* FIXME */
+      fatal (NILF, _("The reverse strftime aspect of the $(date*) functions isn't implemented yet.\n"));
+    }
+  else
+    time(&tval);
+
+  buf_size = 64;
+  buf = xmalloc (buf_size);
+  while (strftime (buf, buf_size, format, 
+                   !strcmp (funcname, "date-utc") 
+                   ? gmtime (&tval) : localtime (&tval)) == 0)
+    buf = xrealloc (buf, buf_size <<= 1);
+  o = variable_buffer_output (o, buf, strlen (buf));
+  free (buf);
+  return o;
+}
+#endif
+
 
 #ifdef CONFIG_WITH_STACK
@@ -3153 +3192 @@
   { STRING_SIZE_TUPLE("comp-cmds"),     3,  3,  1,  func_comp_vars},
 #endif
+#ifdef CONFIG_WITH_DATE
+  { STRING_SIZE_TUPLE("date"),          0,  1,  1,  func_date},
+  { STRING_SIZE_TUPLE("date-utc"),      0,  1,  1,  func_date},
+#endif
 #ifdef CONFIG_WITH_STACK
   { STRING_SIZE_TUPLE("stack-push"),    2,  2,  1,  func_stack_push},

trunk/src/kmk/variable.c

@@ -1027 +1027 @@
 
   /* Define KMK_FEATURES to indicate various working KMK features. */
-# if defined(CONFIG_WITH_RSORT) \
-  && defined(CONFIG_WITH_ABSPATHEX) \
-  && defined(CONFIG_WITH_TOUPPER_TOLOWER) \
-  && defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE) \
-  && defined(CONFIG_WITH_STACK) \
-  && defined(CONFIG_WITH_MATH) \
-  && defined(CONFIG_WITH_XARGS) \
-  && defined(CONFIG_WITH_EXPLICIT_MULTITARGET) \
-  && defined(CONFIG_WITH_PREPEND_ASSIGNMENT) \
-  && defined(CONFIG_WITH_SET_CONDITIONALS) \
-  && defined(KMK_HELPERS)
+# if defined (CONFIG_WITH_RSORT) \
+  && defined (CONFIG_WITH_ABSPATHEX) \
+  && defined (CONFIG_WITH_TOUPPER_TOLOWER) \
+  && defined (CONFIG_WITH_VALUE_LENGTH) && defined (CONFIG_WITH_COMPARE) \
+  && defined (CONFIG_WITH_STACK) \
+  && defined (CONFIG_WITH_MATH) \
+  && defined (CONFIG_WITH_XARGS) \
+  && defined (CONFIG_WITH_EXPLICIT_MULTITARGET) \
+  && defined (CONFIG_WITH_PREPEND_ASSIGNMENT) \
+  && defined (CONFIG_WITH_SET_CONDITIONALS) \
+  && defined (CONFIG_WITH_DATE) \
+  && defined (KMK_HELPERS)
   (void) define_variable ("KMK_FEATURES", 12,
                           "append-dash-n abspath"
@@ -1050 +1051 @@
                           " prepend-assignment"
                           " set-conditionals"
+                          " date"
                           " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one "
                           , o_default, 0);
@@ -1085 +1087 @@
   strcat (buf, " set-conditionals");
 #  endif
+#  if defined (CONFIG_WITH_DATE)
+  strcat (buf, " date");
+#  endif
 #  if defined (KMK_HELPERS)
   strcat (buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one");