Changeset 2516 in kBuild

Timestamp:

Jul 26, 2011 10:04:11 AM (13 years ago)

Author:

bird

Message:

func_abspathex: Don't crash when no cwd is given. Addressed gcc warnings.

File:

• trunk/src/kmk/function.c (modified) (4 diffs)

trunk/src/kmk/function.c

@@ -2683 +2683 @@
 {
   const char *in      = argv[0];
-  size_t      in_len  = strlen (in);
+  math_int    in_len  = (math_int)strlen (in);
   const char *str     = argv[1];
-  size_t      str_len = strlen (str);
+  math_int    str_len = (math_int)strlen (str);
   math_int    n       = 0;
   math_int    length  = str_len;
@@ -2826 +2826 @@
 {
   const char *str     = argv[0];
-  size_t      str_len = strlen (str);
+  math_int    str_len = (math_int)strlen (str);
   math_int    start   = math_int_from_string (argv[1]);
   math_int    length  = 0;
@@ -3614 +3614 @@
   /* cwd needs leading spaces chopped and may be optional,
      in which case we're exactly like $(abspath ). */
-  while (isblank(*cwd))
-    cwd++;
-  if (!*cwd)
+  if (cwd)
+    while (isblank (*cwd))
+      cwd++;
+  if (!cwd || !*cwd)
     o = func_abspath (o, argv, funcname);
   else
@@ -4656 +4657 @@
       else
         {
-          error (NILF, _("bad number: '%s' (base=%d, pos=%d)\n"), start, base, str - start);
+          error (NILF, _("bad number: '%s' (base=%u, pos=%lu)\n"), start, base, (unsigned long)(str - start));
           return 0;
         }