From 392f542ca74be7b3721e7a4af75544a39e0eceae Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 4 Aug 2009 13:58:23 +0000 Subject: Escaping of the $ sign by doubling it was not always done correctly. --- tools/mhmake/src/util.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tools/mhmake/src/util.cpp') diff --git a/tools/mhmake/src/util.cpp b/tools/mhmake/src/util.cpp index 824c94b4d..be0e92281 100644 --- a/tools/mhmake/src/util.cpp +++ b/tools/mhmake/src/util.cpp @@ -274,24 +274,24 @@ loadedmakefile::loadedmakefile_statics::loadedmakefile_statics() string Output; bool Ret; try - { + { string SvnCommand=SearchCommand("svn",EXEEXT); Ret=OsExeCommand(SvnCommand,string(" info ")+m_MhMakeConf->GetFullFileName(),false,&Output); - } + } catch (int) - { + { Ret=false; - } + } char *pTok=strtok((char*)Output.c_str(),"\n"); // doing this is changing string, so this is very dangerous !!! while (pTok) - { + { if (!strncmp(pTok,"URL: ",5)) - { + { m_GlobalCommandLineVars[WC_URL]=pTok+5+7; - } + } else if (!strncmp(pTok,"Revision: ",10)) - { + { m_GlobalCommandLineVars[WC_REVISION]=pTok+10; break; } -- cgit v1.2.3