From 58b69e7eb9be29c60e45d46a880b391e3809e76f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 18 Sep 2009 14:46:17 +0000
Subject: Changes for making it possible to have spaces in the MHMAKECONF
 environment variable.

---
 tools/mhmake/src/util.h | 70 ++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

(limited to 'tools/mhmake/src/util.h')

diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 6d660fc94..5cd242d51 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
 #define PLATFORM     "linux"
 #endif
 
-#define MHMAKEVER    "1.3.22"
+#define MHMAKEVER    "1.4.0"
 
 #define MAKEDEPFILE  ".makefile.dep"
 
@@ -73,39 +73,49 @@ inline const char *NextItem(const char *pTmp,string &Output, const char *pToks="
   const char *pStart;
   const char *pStop;
   while (strchr(pToks,*pTmp)&&*pTmp) pTmp++;
-  if (*pTmp=='"')
+  pStart=pTmp;
+  while (1)
   {
-    pStart=pTmp++;
-    while (*pTmp && *pTmp!='"') pTmp++;
-    if (*pTmp) pTmp++;
-    pStop=pTmp;
-  }
-  else if (*pTmp=='\'')
-  {
-    pStart=pTmp++;
-    while (*pTmp && *pTmp!='\'') pTmp++;
-    if (*pTmp) pTmp++;
-    pStop=pTmp;
-  }
-  else if (!*pTmp)
-  {
-    pStart=pStop=pTmp;
-  }
-  else
-  {
-    pStart=pTmp++;
-    #if OSPATHSEP=='/'
-    while (*pTmp)
+    if (*pTmp=='"')
+    {
+      pTmp++;
+      while (*pTmp && *pTmp!='"') pTmp++;
+      if (*pTmp) pTmp++;
+      pStop=pTmp;
+      if (!*pTmp || strchr(pToks,*pTmp))
+        break;
+    }
+    else if (*pTmp=='\'')
     {
-      if (!strchr(pToks,*pTmp) || (*(pTmp-1)=='\\'))
-        pTmp++;
-      else
+      pTmp++;
+      while (*pTmp && *pTmp!='\'') pTmp++;
+      if (*pTmp) pTmp++;
+      pStop=pTmp;
+      if (!*pTmp || strchr(pToks,*pTmp))
         break;
     }
-    #else
-    while (!strchr(pToks,*pTmp)) pTmp++;
-    #endif
-    pStop=pTmp;
+    else if (!*pTmp)
+    {
+      pStop=pTmp;
+      break;
+    }
+    else
+    {
+      pTmp++;
+      #if OSPATHSEP=='/'
+      while (*pTmp)
+      {
+        if (!strchr(pToks,*pTmp) || (*(pTmp-1)=='\\'))
+          pTmp++;
+        else
+          break;
+      }
+      #else
+      while (!strchr(pToks,*pTmp)) pTmp++;
+      #endif
+      pStop=pTmp;
+      break;
+    }
   }
   Output=string(pStart,pStop);
   // skip trailing space
-- 
cgit v1.2.3