upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-23 23:29:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/parse_ini.c: Remove outdated comment and code

Browse source 
The lib/parse_ini.c:np_get_defaults() function now dies if no
configuration file is found.
This commit is contained in:
Holger Weiss 2014-06-18 00:50:48 +02:00
parent fbe13d8f32
commit 95ed0a996c
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/parse_ini.c
View file

@ -30,8 +30,6 @@
#include <sys/stat.h>
#include <unistd.h>
/* TODO: die like N::P if config file is not found */
/* np_ini_info contains the result of parsing a "locator" in the format
* [stanza_name][@config_filename] (check_foo@/etc/foo.ini, for example)
*/
@ -112,20 +110,17 @@ np_arg_list* np_get_defaults(const char *locator, const char *default_section){
np_ini_info i;
parse_locator(locator, default_section, &i);
/* if a file was specified or if we're using the default file */
if(i.file != NULL && strlen(i.file) > 0){
if(strcmp(i.file, "-")==0){
inifile=stdin;
} else {
inifile=fopen(i.file, "r");
}
if(inifile==NULL) die(STATE_UNKNOWN, "%s\n", _("Can't read config file"));
if(read_defaults(inifile, i.stanza, &defaults)==FALSE)
die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file);
free(i.file);
if(inifile!=stdin) fclose(inifile);
if(strcmp(i.file, "-")==0){
inifile=stdin;
} else {
inifile=fopen(i.file, "r");
}
if(inifile==NULL) die(STATE_UNKNOWN, "%s\n", _("Can't read config file"));
if(read_defaults(inifile, i.stanza, &defaults)==FALSE)
die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file);
free(i.file);
if(inifile!=stdin) fclose(inifile);
free(i.stanza);
return defaults;
}