D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-12 10:53:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure -run doesn't consume the config file flags.

Browse Source
This commit is contained in:
Christian Kamm
2009-04-05 15:58:28 +02:00
parent 253e743d05
commit ba200214d4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gen/main.cpp
View File

@@ -163,8 +163,11 @@ int main(int argc, char** argv)
std::vector<const char*> final_args;
final_args.reserve(argc);
// insert argc + DFLAGS
final_args.insert(final_args.end(), &argv[0], &argv[argc]);
// insert command line args until -run is reached
int run_argnum = 1;
while (run_argnum < argc && strncmp(argv[run_argnum], "-run", 4) != 0)
++run_argnum;
final_args.insert(final_args.end(), &argv[0], &argv[run_argnum]);
// read the configuration file
ConfigFile cfg_file;
@@ -181,6 +184,9 @@ int main(int argc, char** argv)
// insert config file additions to the argument list
final_args.insert(final_args.end(), cfg_file.switches_begin(), cfg_file.switches_end());
// insert -run and everything beyond
final_args.insert(final_args.end(), &argv[run_argnum], &argv[argc]);
#if 0
for (size_t i = 0; i < final_args.size(); ++i)
{