Changeset 3322 for trunk/src/kmk/kbuild.c

Timestamp:

Apr 17, 2020, 12:23:49 AM (5 years ago)

Author:

bird

Message:

kmk/kbuild: kbuild_apply_defpath must walk quoted file tokens rather than simple space separated tokens. Added find_next_file_token to do the parsing. Updated find_next_token_eos with correct variable expansion skipping.

File:

• trunk/src/kmk/kbuild.c (modified) (2 diffs)

trunk/src/kmk/kbuild.c

@@ -382 +382 @@
 kbuild_apply_defpath(struct variable *pDefPath, char **ppsz, unsigned int *pcch, unsigned int *pcchAlloc, int fCanFree)
 {
-    const char *pszIterator;
-    const char *pszInCur;
     unsigned int cchInCur;
     unsigned int cchMaxRelative = 0;
-    unsigned int cRelativePaths;
+    const char *pszInCur;
 
     /*
      * The first pass, count the relative paths.
      */
-    cRelativePaths = 0;
-    pszIterator = *ppsz;
-    while ((pszInCur = find_next_token(&pszIterator, &cchInCur)) != NULL)
+    const char *pszIterator = *ppsz;
+    const char * const pszEos = pszIterator + *pcch;
+    unsigned int cRelativePaths = 0;
+    assert(*pszEos == '\0');
+    while ((pszInCur = find_next_file_token(&pszIterator, pszEos, &cchInCur)) != NULL)
     {
         /* is relative? */
@@ -438 +438 @@
         cRelativePaths = 0;
         pszIterator = *ppsz;
-        while ((pszInCur = find_next_token(&pszIterator, &cchInCur)))
+        while ((pszInCur = find_next_file_token(&pszIterator, pszEos, &cchInCur)))
         {
             /* is relative? */