Changeset 2556 in kBuild for trunk/src/kmk

Timestamp:

Nov 30, 2011 8:44:27 PM (13 years ago)

Author:

bird

Message:

umask fixes.

File:

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

trunk/src/kmk/function.c

@@ -77 +77 @@
   extern APIRET APIENTRY DosQueryHeaderInfo(HMODULE hmod, ULONG ulIndex, PVOID pvBuffer, ULONG cbBuffer, ULONG ulSubFunction);
 #endif /* CONFIG_WITH_OS2_LIBPATH */
+
+#ifdef KMK
+/** Checks if the @a_cch characters (bytes) in @a a_psz equals @a a_szConst. */
+# define STR_N_EQUALS(a_psz, a_cch, a_szConst) \
+    ( (a_cch) == sizeof (a_szConst) - 1 && !strncmp ((a_psz), (a_szConst), sizeof (a_szConst) - 1) )
+#endif
 
 
@@ -5264 +5270 @@
   mode_t u;
   int symbolic = 0;
-
-  if (argv[0])
-    {
-      if (   !strcmp (argv[0], "S")
-          || !strcmp (argv[0], "-S")
-          || !strcmp (argv[0], "symbolic") )
-        symbolic = 1;
-      else
-        error (reading_file, _("$(%s ) invalid argument `%s'"), funcname, argv[0]);
+  const char *psz = argv[0];
+
+  if (psz)
+    {
+      const char *pszEnd = strchr (psz, '\0');
+      strip_whitespace (&psz, &pszEnd);
+
+      if (pszEnd != psz)
+        {
+          if (   STR_N_EQUALS (psz, pszEnd - pszEnd, "S")
+              || STR_N_EQUALS (psz, pszEnd - pszEnd, "-S")
+              || STR_N_EQUALS (psz, pszEnd - pszEnd, "symbolic") )
+            symbolic = 1;
+          else
+            error (reading_file, _("$(%s ) invalid argument `%s'"),
+                   funcname, argv[0]);
+        }
     }
 
@@ -5333 +5347 @@
         {
           u <<= 3;
-          if (*psz >= '0' && *psz < '8')
-            u += *psz - '0';
-          else
-            error (reading_file, _("$(%s ) illegal number `%s'"), funcname, argv[0]);
+          if (*psz < '0' || *psz >= '8')
+            {
+              error (reading_file, _("$(%s ) illegal number `%s'"), funcname, argv[0]);
+              break;
+            }
+          u += *psz - '0';
+          psz++;
         }