5159241db7
Added doxygen comments to inifile.hh.
Updated initest. Some other minor cleanup.
base/inifile.cc:
Add support for '+=' append operation.
Factor common code from IniFile::load() and IniFile::add() into new Section::add().
Rename ConfigTable to SectionTable (more descriptive).
Fix bug in Section::dump().
base/inifile.hh:
Add doxygen comments.
Add support for '+=' append operation.
Factor common code from IniFile::load() and IniFile::add() into new Section::add().
Rename ConfigTable to SectionTable (more descriptive).
test/Makefile:
initest needs cprintf.o now.
test/foo.ini:
Add test of '+=' operator.
test/initest.cc:
Bring this up-to-date. Steal main loop from main.cc so we can test
multiple .ini files and command-line assignments too.
--HG--
extra : convert_revision : 982521677fbf464e93aa93798ff7d9611826f17c
143 lines
4.1 KiB
C++
143 lines
4.1 KiB
C++
/*
|
|
* Copyright (c) 2003 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/inifile.hh"
|
|
#include "base/cprintf.hh"
|
|
|
|
using namespace std;
|
|
|
|
char *progname;
|
|
|
|
void
|
|
usage()
|
|
{
|
|
cout << "Usage: " << progname << " <ini file>\n";
|
|
exit(1);
|
|
}
|
|
|
|
#if 0
|
|
char *defines = getenv("CONFIG_DEFINES");
|
|
if (defines) {
|
|
char *c = defines;
|
|
while ((c = strchr(c, ' ')) != NULL) {
|
|
*c++ = '\0';
|
|
count++;
|
|
}
|
|
count++;
|
|
}
|
|
|
|
#endif
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
IniFile simConfigDB;
|
|
|
|
progname = argv[0];
|
|
|
|
vector<char *> cppArgs;
|
|
|
|
vector<char *> cpp_options;
|
|
cpp_options.reserve(argc * 2);
|
|
|
|
for (int i = 1; i < argc; ++i) {
|
|
char *arg_str = argv[i];
|
|
|
|
// if arg starts with '-', parse as option,
|
|
// else treat it as a configuration file name and load it
|
|
if (arg_str[0] == '-') {
|
|
|
|
// switch on second char
|
|
switch (arg_str[1]) {
|
|
case 'D':
|
|
case 'U':
|
|
case 'I':
|
|
// cpp options: record & pass to cpp. Note that these
|
|
// cannot have spaces, i.e., '-Dname=val' is OK, but
|
|
// '-D name=val' is not. I don't consider this a
|
|
// problem, since even though gnu cpp accepts the
|
|
// latter, other cpp implementations do not (Tru64,
|
|
// for one).
|
|
cppArgs.push_back(arg_str);
|
|
break;
|
|
|
|
case '-':
|
|
// command-line configuration parameter:
|
|
// '--<section>:<parameter>=<value>'
|
|
|
|
if (!simConfigDB.add(arg_str + 2)) {
|
|
// parse error
|
|
ccprintf(cerr,
|
|
"Could not parse configuration argument '%s'\n"
|
|
"Expecting --<section>:<parameter>=<value>\n",
|
|
arg_str);
|
|
exit(0);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
usage();
|
|
}
|
|
}
|
|
else {
|
|
// no '-', treat as config file name
|
|
|
|
if (!simConfigDB.loadCPP(arg_str, cppArgs)) {
|
|
cprintf("Error processing file %s\n", arg_str);
|
|
exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
string value;
|
|
|
|
#define FIND(C, E) \
|
|
if (simConfigDB.find(C, E, value)) \
|
|
cout << ">" << value << "<\n"; \
|
|
else \
|
|
cout << "Not Found!\n"
|
|
|
|
FIND("General", "Test2");
|
|
FIND("Junk", "Test3");
|
|
FIND("Junk", "Test4");
|
|
FIND("General", "Test1");
|
|
FIND("Junk2", "test3");
|
|
FIND("General", "Test3");
|
|
|
|
cout << "\n";
|
|
|
|
simConfigDB.dump();
|
|
|
|
return 0;
|
|
}
|