nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some extra checking

Browse source
This commit is contained in:
fluxgen 2003-06-30 20:59:28 +00:00
parent da2fe66b59
commit 785b3f955f
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Keys.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
//$Id: Keys.cc,v 1.33 2003/06/30 19:42:20 fluxgen Exp $ //$Id: Keys.cc,v 1.34 2003/06/30 20:59:28 fluxgen Exp $
#include "Keys.hh" #include "Keys.hh"
@ -194,19 +194,22 @@ bool Keys::load(const char *filename) {
const char *str = const char *str =
FbTk::StringUtil::strcasestr(linebuffer.c_str(), FbTk::StringUtil::strcasestr(linebuffer.c_str(),
val[argc].c_str() + 1); // +1 to skip ':' val[argc].c_str() + 1); // +1 to skip ':'
if (str == 0) {
// +1 to remove the first ':'
last_key->m_command = CommandParser::instance().parseLine(str);
if (*last_key->m_command == 0) {
cerr<<"File: "<<filename<<". Error on line: "<<line<<endl; cerr<<"File: "<<filename<<". Error on line: "<<line<<endl;
cerr<<"> "<<linebuffer<<endl; cerr<<"> "<<linebuffer<<endl;
} else { } else {
// Add the keychain to list
if (!mergeTree(current_key)) last_key->m_command = CommandParser::instance().parseLine(str);
cerr<<"Keys: Failed to merge keytree!"<<endl;
if (*last_key->m_command == 0) {
cerr<<"File: "<<filename<<". Error on line: "<<line<<endl;
cerr<<"> "<<linebuffer<<endl;
} else {
// Add the keychain to list
if (!mergeTree(current_key))
cerr<<"Keys: Failed to merge keytree!"<<endl;
}
} }
delete current_key; delete current_key;
current_key = 0; current_key = 0;
last_key = 0; last_key = 0;