Changeset 1122 in kBuild

Timestamp:

Sep 25, 2007 6:16:26 AM (18 years ago)

Author:

bird

Message:

Added as $(file-size ) function while at it.

Location:

trunk/src/kmk

Files:

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

trunk/src/kmk/Makefile.am ¶

@@ -113 +113 @@
         -DCONFIG_WITH_SET_CONDITIONALS \
         -DCONFIG_WITH_DATE \
+        -DCONFIG_WITH_FILE_SIZE \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
         \

trunk/src/kmk/Makefile.kmk ¶

@@ -115 +115 @@
         CONFIG_WITH_SET_CONDITIONALS \
         CONFIG_WITH_DATE \
+        CONFIG_WITH_FILE_SIZE \
         CONFIG_PRETTY_COMMAND_PRINTING \
         \

trunk/src/kmk/function.c ¶

@@ -43 +43 @@
 #include <assert.h> /* bird */
 
-#if defined (CONFIG_WITH_MATH) || defined (CONFIG_WITH_NANOTS) /* bird */
+#if defined (CONFIG_WITH_MATH) || defined (CONFIG_WITH_NANOTS) || defined (CONFIG_WITH_FILE_SIZE) /* bird */
 # include <ctype.h>
 # ifdef _MSC_VER
@@ -51 +51 @@
 typedef int64_t math_int;
 # endif
+static char *math_int_to_variable_buffer (char *, math_int);
 #endif
 
@@ -2674 +2675 @@
 
 #ifdef CONFIG_WITH_DATE
+/* The first argument is the strftime format string, a iso 
+   timestamp is the default if nothing is given.
+
+   The second argument is a time value if given. The format
+   is either the format from the first argument or given as
+   an additional third argument. */
 static char *
 func_date (char *o, char **argv, const char *funcname)
@@ -2689 +2696 @@
         buf++;
       if (*buf)
-        format = buf;
+        format = argv[0];
     }
 
@@ -2709 +2716 @@
   free (buf);
   return o;
+}
+#endif
+
+#ifdef CONFIG_WITH_FILE_SIZE
+/* Prints the size of the specified file. Only one file is 
+   permitted, notthing is stripped. -1 is returned if stat
+   fails. */
+static char *
+func_file_size (char *o, char **argv, const char *funcname)
+{
+  struct stat st;
+  if (stat (argv[0], &st))
+    return variable_buffer_output (o, "-1", 2);
+  return math_int_to_variable_buffer (o, st.st_size);
 }
 #endif
@@ -2762 +2783 @@
 #endif /* CONFIG_WITH_STACK */
 
-#if defined (CONFIG_WITH_MATH) || defined (CONFIG_WITH_NANOTS)
+#if defined (CONFIG_WITH_MATH) || defined (CONFIG_WITH_NANOTS) || defined (CONFIG_WITH_FILE_SIZE)
 /* outputs the number (as a string) into the variable buffer. */
 static char *
@@ -3196 +3217 @@
   { STRING_SIZE_TUPLE("date-utc"),      0,  1,  1,  func_date},
 #endif
+#ifdef CONFIG_WITH_FILE_SIZE
+  { STRING_SIZE_TUPLE("file-size"),     1,  1,  1,  func_file_size},
+#endif
 #ifdef CONFIG_WITH_STACK
   { STRING_SIZE_TUPLE("stack-push"),    2,  2,  1,  func_stack_push},

trunk/src/kmk/variable.c ¶

@@ -1038 +1038 @@
   && defined (CONFIG_WITH_SET_CONDITIONALS) \
   && defined (CONFIG_WITH_DATE) \
+  && defined (CONFIG_WITH_FILE_SIZE) \
   && defined (KMK_HELPERS)
   (void) define_variable ("KMK_FEATURES", 12,
@@ -1052 +1053 @@
                           " set-conditionals"
                           " date"
+                          " file-size"
                           " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one "
                           , o_default, 0);
@@ -1090 +1092 @@
   strcat (buf, " date");
 #  endif
+#  if defined (CONFIG_WITH_FILE_SIZE)
+  strcat (buf, " file-size");
+#  endif
 #  if defined (KMK_HELPERS)
   strcat (buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one");