0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable {~} and {@} when using zipios,

Browse source 
they cause redundant reading of config files
This commit is contained in:
Yann Dirson 2005-02-19 23:40:50 +00:00
parent e8647c5e00
commit 012fc25b20
2 changed files with 50 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelog
View file

@ -1,7 +1,10 @@
CVS HEAD:
* updated translations:
* French
* when using zipios, ignore {~...} clauses, and handle {@...} as if there
was no '@', fixing the double appearance of user campaigns in the
campaign listing
Version 0.8.11:
* new translation:
* British English

72
src/config.cpp
View file

@ -206,37 +206,57 @@ void internal_preprocess_data(const std::string& data,
std::string prefix;
std::string nfname;
//if the filename begins with a '~', then look
//in the user's data directory. If the filename begins with
//a '@' then we look in the user's data directory,
//but default to the standard data directory if it's not found
//there.
if(newfilename != "" && (newfilename[0] == '~' || newfilename[0] == '@')) {
nfname = newfilename;
nfname.erase(nfname.begin(),nfname.begin()+1);
nfname = get_user_data_dir() + "/data/" + nfname;
#ifdef USE_ZIPIOS
if(newfilename != "" && newfilename[0] == '~') {
// I do not know of any valid use of {~xxx} when {xxx} is
// not used, and zipios takes care of both
LOG_CF << "ignoring reference to '" << newfilename << "'\n";
} else
#endif
{
#ifndef USE_ZIPIOS
//if the filename begins with a '~', then look
//in the user's data directory. If the filename begins with
//a '@' then we look in the user's data directory,
//but default to the standard data directory if it's not found
//there.
if(newfilename != "" && (newfilename[0] == '~' || newfilename[0] == '@')) {
nfname = newfilename;
nfname.erase(nfname.begin(),nfname.begin()+1);
nfname = get_user_data_dir() + "/data/" + nfname;
LOG_CF << "got relative name '" << newfilename << "' -> '" << nfname << "'\n";
LOG_CF << "got relative name '" << newfilename << "' -> '" << nfname << "'\n";
if(newfilename[0] == '@' && file_exists(nfname) == false && is_directory(nfname) == false) {
nfname = "data/" + newfilename.substr(1);
}
} else if(newfilename.size() >= 2 && newfilename[0] == '.' &&
if(newfilename[0] == '@' && file_exists(nfname) == false && is_directory(nfname) == false) {
nfname = "data/" + newfilename.substr(1);
}
} else
#endif
if(newfilename.size() >= 2 && newfilename[0] == '.' &&
newfilename[1] == '/' ) {
//if the filename begins with a "./", then look
//in the same directory as the file currrently
//being preprocessed
nfname = newfilename;
nfname.erase(nfname.begin(),nfname.begin()+2);
nfname = directory_name(fname) + nfname;
//if the filename begins with a "./", then look
//in the same directory as the file currrently
//being preprocessed
nfname = newfilename;
nfname.erase(nfname.begin(),nfname.begin()+2);
nfname = directory_name(fname) + nfname;
} else {
nfname = "data/" + newfilename;
}
} else {
#ifdef USE_ZIPIOS
if(newfilename != "" && newfilename[0] == '@') {
nfname = newfilename;
nfname.erase(nfname.begin(),nfname.begin()+1);
nfname = "data/" + nfname;
} else
#endif
internal_preprocess_file(nfname,
defines_map, depth+1,res,
lines_src,line);
nfname = "data/" + newfilename;
}
internal_preprocess_file(nfname,
defines_map, depth+1,res,
lines_src,line);
}
} else {
const std::string& str = read_file(newfilename);
res.insert(res.end(),str.begin(),str.end());