Changeset 3140 in kBuild for trunk/src/kmk/kbuild.c

Timestamp:

Mar 14, 2018 9:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• kbuild.c (modified) (17 diffs)

trunk/src/kmk/kbuild.c

@@ -30 +30 @@
 *******************************************************************************/
 #define NO_MEMCOPY_HACK
-#include "make.h"
+#include "makeint.h"
 #include "filedef.h"
 #include "variable.h"
@@ -116 +116 @@
         g_pszInitialCwd = xstrdup(szTmp);
     else
-        fatal(NILF, _("getcwd failed"));
+        O(fatal, NILF, _("getcwd failed"));
 
     /*
@@ -282 +282 @@
                 strcat(strcpy(pszTmp2, get_kbuild_bin_path()), "/../..");
                 if (!my_abspath(pszTmp2, szTmpPath))
-                    fatal(NILF, _("failed to determin KBUILD_PATH"));
+                    O(fatal, NILF, _("failed to determin KBUILD_PATH"));
 #endif
             }
@@ -332 +332 @@
 
                 if (!my_abspath(pszTmp2, szTmpPath))
-                    fatal(NILF, _("failed to determin KBUILD_BIN_PATH (pszTmp2=%s szTmpPath=%s)"), pszTmp2, szTmpPath);
+                    OSS(fatal, NILF, _("failed to determin KBUILD_BIN_PATH (pszTmp2=%s szTmpPath=%s)"), pszTmp2, szTmpPath);
 #endif /* !KBUILD_PATH */
             }
@@ -506 +506 @@
     struct variable *pVar = lookup_variable(pszName, cchName);
     if (!pVar)
-        fatal(NILF, _("variable `%.*s' isn't defined!"), (int)cchName, pszName);
+        fatal(NILF, cchName, _("variable `%.*s' isn't defined!"), (int)cchName, pszName);
     if (pVar->recursive)
-        fatal(NILF, _("variable `%.*s' is defined as `recursive' instead of `simple'!"), (int)cchName, pszName);
+        fatal(NILF, cchName, _("variable `%.*s' is defined as `recursive' instead of `simple'!"), (int)cchName, pszName);
 
     MY_ASSERT_MSG(strlen(pVar->value) == pVar->value_length,
@@ -528 +528 @@
     struct variable *pVar = lookup_variable(pszName, strlen(pszName));
     if (!pVar)
-        fatal(NILF, _("variable `%s' isn't defined!"), pszName);
+        OS(fatal, NILF, _("variable `%s' isn't defined!"), pszName);
 
     MY_ASSERT_MSG(strlen(pVar->value) == pVar->value_length,
@@ -980 +980 @@
         psz = pVar->value;
         pszEnd = psz + pVar->value_length;
-        while (isblank((unsigned char)*psz))
+        while (ISBLANK(*psz))
             psz++;
-        while (pszEnd > psz && isblank((unsigned char)pszEnd[-1]))
+        while (pszEnd > psz && ISBLANK(pszEnd[-1]))
             pszEnd--;
         if (pszEnd > psz)
@@ -1035 +1035 @@
                                               pszVarName);
     if (!pVar)
-        fatal(NILF, _("no tool for source `%s' in target `%s'!"), pSource->value, pTarget->value);
+        OSS(fatal, NILF, _("no tool for source `%s' in target `%s'!"), pSource->value, pTarget->value);
     return pVar;
 }
@@ -1084 +1084 @@
                                               pszVarName);
     if (!pVar)
-        fatal(NILF, _("no OBJSUFF attribute or SUFF_OBJ default for source `%s' in target `%s'!"), pSource->value, pTarget->value);
+        OSS(fatal, NILF, _("no OBJSUFF attribute or SUFF_OBJ default for source `%s' in target `%s'!"),
+            pSource->value, pTarget->value);
     return pVar;
 }
@@ -1841 +1842 @@
         iDirection = -1;
     else
-        fatal(NILF, _("incorrect direction argument `%s'!"), argv[2]);
+        OS(fatal, NILF, _("incorrect direction argument `%s'!"), argv[2]);
     if (argv[3])
     {
         const char *psz = argv[3];
-        while (isspace(*psz))
+        while (ISSPACE(*psz))
             psz++;
         if (*psz)
@@ -1919 +1920 @@
         psz--;
         if (psz <= pszResult)
-            fatal(NULL, "whut!?! no path? result=`%s'", pszResult);
+            OS(fatal, NULL, "whut!?! no path? result=`%s'", pszResult);
 #ifdef HAVE_DOS_PATHS
         if (*psz == ':')
@@ -2042 +2043 @@
                 iVer = 0;
                 psz = argv[0];
-                while (isblank((unsigned char)*psz))
+                while (ISBLANK(*psz))
                     psz++;
                 if (*psz)
@@ -2264 +2265 @@
 
     install_variable_buffer(&pszSavedVarBuf, &cchSavedVarBuf);
-    eval_buffer(pszVal, psz);
+    eval_buffer(pszVal, NULL, psz);
     restore_variable_buffer(pszSavedVarBuf, cchSavedVarBuf);
 
@@ -2502 +2503 @@
      */
     if (pszVersion[0] != '1' || pszVersion[1])
-      fatal(NULL, "%s: Unsupported version `%s'", pszFuncName, pszVersion);
+      OSS(fatal, NULL, "%s: Unsupported version `%s'", pszFuncName, pszVersion);
 
     if (!cchBldTrg)
-      fatal(NULL, "%s: missing bldtrg", pszFuncName);
+      OS(fatal, NULL, "%s: missing bldtrg", pszFuncName);
 
     if (!cchBldTrgArch)
-      fatal(NULL, "%s: missing bld_trg_arch", pszFuncName);
+      OS(fatal, NULL, "%s: missing bld_trg_arch", pszFuncName);
 
     if (!cchBldTrgCpu)
-      fatal(NULL, "%s: missing bld_trg_cpu", pszFuncName);
+      OS(fatal, NULL, "%s: missing bld_trg_cpu", pszFuncName);
 
     if (!cchBldType)
-      fatal(NULL, "%s: missing bld_type", pszFuncName);
+      OS(fatal, NULL, "%s: missing bld_type", pszFuncName);
 
     /*
@@ -2633 +2634 @@
     {
         if (   pDefTemplate->value_length
-            && (   isspace(pDefTemplate->value[0])
-                || isspace(pDefTemplate->value[pDefTemplate->value_length - 1])))
+            && (   ISSPACE(pDefTemplate->value[0])
+                || ISSPACE(pDefTemplate->value[pDefTemplate->value_length - 1])))
         {
             unsigned int off;
             if (pDefTemplate->rdonly_val)
-                fatal(NULL, "%s: TEMPLATE is read-only", pszFuncName);
+                OS(fatal, NULL, "%s: TEMPLATE is read-only", pszFuncName);
 
             /* head */
-            for (off = 0; isspace(pDefTemplate->value[off]); off++)
+            for (off = 0; ISSPACE(pDefTemplate->value[off]); off++)
                 /* nothing */;
             if (off)
@@ -2651 +2652 @@
             /* tail */
             off = pDefTemplate->value_length;
-            while (off > 0 && isspace(pDefTemplate->value[off - 1]))
+            while (off > 0 && ISSPACE(pDefTemplate->value[off - 1]))
                 off--;
             pDefTemplate->value_length = off;
@@ -2706 +2707 @@
             pszTmpl = pTmpl->value;
             cchTmpl = pTmpl->value_length;
-            while (isspace(*pszTmpl))
+            while (ISSPACE(*pszTmpl))
                 cchTmpl--, pszTmpl++;
             if (!cchTmpl)