Changeset 3192 for trunk/src/kmk/kmkbuiltin/kbuild_protection.c

Timestamp:

Mar 26, 2018, 10:25:56 PM (7 years ago)

Author:

bird

Message:

kmkbuiltin: funnel output thru output.c (usually via err.c).

File:

• trunk/src/kmk/kmkbuiltin/kbuild_protection.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/kbuild_protection.c

@@ -116 +116 @@
  *          On failure an error is printed, eval is set and -1 is returned.
  */
-static int countPathComponents(const char *pszPath)
+static int countPathComponents(PCKBUILDPROTECTION pThis, const char *pszPath)
 {
     int cComponents = 0;
@@ -158 +158 @@
             if (!pszTmp)
             {
-                err(1, "_getdcwd");
+                err(pThis->pCtx, 1, "_getdcwd");
                 return -1;
             }
@@ -196 +196 @@
         if (!getcwd(szCwd, sizeof(szCwd)))
         {
-            err(1, "getcwd");
+            err(pThis->pCtx, 1, "getcwd");
             return -1;
         }
@@ -217 +217 @@
  * @param   pThis   Pointer to the instance data.
  */
-void kBuildProtectionInit(PKBUILDPROTECTION pThis)
+void kBuildProtectionInit(PKBUILDPROTECTION pThis, PKMKBUILTINCTX pCtx)
 {
     pThis->uMagic = KBUILD_PROTECTION_MAGIC;
+    pThis->pCtx = pCtx;
     pThis->afTypes[KBUILDPROTECTIONTYPE_FULL] = 0;
     pThis->afTypes[KBUILDPROTECTIONTYPE_RECURSIVE] = 1;
@@ -268 +269 @@
     /* number or path? */
     if (!isdigit(*pszValue) || strpbrk(pszValue, ":/\\"))
-        pThis->cProtectionDepth = countPathComponents(pszValue);
+        pThis->cProtectionDepth = countPathComponents(pThis, pszValue);
     else
     {
@@ -280 +281 @@
         }
         if (!pThis->cProtectionDepth || pszValue == pszMore || *pszMore)
-            return errx(1, "bogus protection depth: %s", pszValue);
+            return errx(pThis->pCtx, 1, "bogus protection depth: %s", pszValue);
     }
 
     if (pThis->cProtectionDepth < 1)
-        return  errx(1, "bogus protection depth: %s", pszValue);
+        return  errx(pThis->pCtx, 1, "bogus protection depth: %s", pszValue);
     return 0;
 }
@@ -351 +352 @@
          * Count the path and compare it with the required depth.
          */
-        int cComponents = countPathComponents(pszPath);
+        int cComponents = countPathComponents(pThis, pszPath);
         if (cComponents < 0)
             return -1;
         if ((unsigned int)cComponents <= pThis->cProtectionDepth)
         {
-            errx(1, "%s: protected", pszPath);
+            errx(pThis->pCtx, 1, "%s: protected", pszPath);
             return -1;
         }