Changeset 2153 in kBuild

Timestamp:

Dec 29, 2008 12:11:30 AM (16 years ago)

Author:

bird

Message:

kmk: substr fixes

Location:

trunk/src/kmk

Files:

• function.c (modified) (6 diffs)
• tests/scripts/functions/substr (added)

trunk/src/kmk/function.c

@@ -2469 +2469 @@
             }
         }
-      length = math_int_from_string (argv[1]);
+      length = math_int_from_string (argv[2]);
       if (length < 0 || (pad != NULL && length > 16*1024*1024 /* 16MB */))
         fatal (NILF, _("$(substr ): length=%s is out of bounds\n"), argv[3]);
@@ -2479 +2479 @@
   if (pad == NULL)
     {
-      if (start > str_len)
+      if (start > 0)
         {
           start--;      /* one-origin */
@@ -2498 +2498 @@
               start = 0;
             }
-          else if (length == 0)
+          else if (length == 0 || start + length > str_len)
             length = str_len - start;
         }
@@ -2506 +2506 @@
   else
     {
-      if (start > str_len)
+      if (start > 0)
         {
           start--;      /* one-origin */
@@ -2520 +2520 @@
             {
               if (start + length <= 0)
-                return o;
+                return length ? helper_insert_pad (o, length, pad, pad_len) : o;
               o = helper_insert_pad (o, -start, pad, pad_len);
-              return variable_buffer_output (o, str, length + length);
+              return variable_buffer_output (o, str, length + start);
             }
           if (length == 0)
@@ -2532 +2532 @@
         {
           o = variable_buffer_output (o, str + start, str_len - start);
-          o = helper_insert_pad (o, start + length - start, pad, pad_len);
+          o = helper_insert_pad (o, start + length - str_len, pad, pad_len);
         }
     }