github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Ini: Fixed C comment issue #768

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7328 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-04-28 13:17:25 +00:00
parent 4c1f98ca3c
commit f0fd46daa4
1 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

52
uppsrc/Core/Ini.cpp
View file

@ -2,27 +2,6 @@
namespace Upp {
String ReplaceEnvVars(CParser& p) {
const VectorMap<String, String>& vars = Environment();
String r;
const char* s = p.GetPtr();
while (!p.IsEof()) {
if(p.Char2('$', '$')) {
r.Cat('$');
} else if(p.Char('$') && p.IsId()) {
String id = p.ReadId();
int q = vars.Find(id);
if(q >= 0)
r.Cat(vars[q]);
} else {
p.SkipTerm();
r.Cat(s, p.GetPtr());
}
s = p.GetPtr();
}
return r;
}
static void LoadIniStream(Stream &sin, VectorMap<String, String>& ret, const char *sfile);
static void LoadIniFile(const char *filename, VectorMap<String, String>& ret)
@ -39,8 +18,35 @@ static void LoadIniStream(Stream& in, VectorMap<String, String>& key, const char
CParser p(line);
if(p.IsId()) {
String k = p.ReadId();
if(p.Char('='))
key.Add(k, env ? ReplaceEnvVars(p) : (String)p.GetPtr());
if(p.Char('=')) {
String h = TrimBoth((String)p.GetSpacePtr());
if(env) {
String hh;
const char *s = ~h;
while(*s) {
if(*s == '$') {
s++;
if(*s == '$') {
hh.Cat('$');
s++;
}
else {
while(*s == ' ')
s++;
String id;
while(iscid(*s))
id.Cat(*s++);
hh.Cat(GetEnv(id));
}
}
else
hh.Cat(*s++);
}
key.Add(k, hh);
}
else
key.Add(k, h);
}
}
else
if(p.Char('@')) {