diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-03 13:35:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-03 13:35:24 +0000 |
| commit | e376e2d6a81e1fb2e8afc1edb1fcfdcb10b027e7 (patch) | |
| tree | 5db501da9b5272f0a8247d5b659db64d0c66ba90 /tools/mhmake/src/functions.cpp | |
| parent | c9b1b51519b4bc44579adb254dc28aa89bc8c913 (diff) | |
| download | vcxsrv-e376e2d6a81e1fb2e8afc1edb1fcfdcb10b027e7.tar.gz vcxsrv-e376e2d6a81e1fb2e8afc1edb1fcfdcb10b027e7.tar.bz2 vcxsrv-e376e2d6a81e1fb2e8afc1edb1fcfdcb10b027e7.zip | |
- Solved problem in generated error string when build-command failed.1.7.99.1
- Strip function now strips all white space (including \r and \n)
Diffstat (limited to 'tools/mhmake/src/functions.cpp')
| -rw-r--r-- | tools/mhmake/src/functions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mhmake/src/functions.cpp b/tools/mhmake/src/functions.cpp index 5b59044c7..6ba64c3c1 100644 --- a/tools/mhmake/src/functions.cpp +++ b/tools/mhmake/src/functions.cpp @@ -622,10 +622,10 @@ string mhmakefileparser::f_strip(const string & Arg) const {
string::const_iterator pFirst=Arg.begin();
string::const_iterator pLast=Arg.end();
- while (strchr(" \t",*pFirst) && pFirst!=pLast) pFirst++;
+ while (strchr(" \t\r\n",*pFirst) && pFirst!=pLast) pFirst++;
if (pFirst==pLast)
return "";
- while (strchr(" \t",*(--pLast)));
+ while (strchr(" \t\r\n",*(--pLast)));
pLast++;
return Arg.substr(pFirst-Arg.begin(),pLast-pFirst);
}
|