upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-02-20 00:10:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix segfault in test_ini.c and uncomment the affected tests

Browse source 
Fix bug in stanza parsing where full section could be skipped
Fix single-argument options


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1946 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Thomas Guyot-Sionnest 2008-03-15 16:17:49 +00:00
parent 6004d95868
commit ffab7ee68b
2 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/parse_ini.c
View file

@ -85,14 +85,14 @@ np_arg_list* np_get_defaults(const char *locator, const char *default_section){
/* 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=stdout;
inifile=stdout; /* FIXME: Shouldn't it be 'stdin' ??? */
} else {
inifile=fopen(i.file, "r");
}
if(inifile==NULL) die(STATE_UNKNOWN, _("Config file error"));
defaults=read_defaults(inifile, i.stanza);
free(i.file);
if(inifile!=stdout) fclose(inifile);
if(inifile!=stdout) fclose(inifile); /* FIXME: Shouldn't it be 'stdin' ??? */
}
free(i.stanza);
return defaults;
@ -126,9 +126,9 @@ static np_arg_list* read_defaults(FILE *f, const char *stanza){
stanzastate=WRONGSTANZA;
for(i=0; i<stanza_len; i++){
c=fgetc(f);
/* nope, read to the end of the stanza header */
/* nope, read to the end of the line */
if(c!=stanza[i]) {
GOBBLE_TO(f, c, ']');
GOBBLE_TO(f, c, '\n');
break;
}
}
@ -215,14 +215,18 @@ static int add_option(FILE *f, np_arg_list **optlst){
for(valptr=eqptr+1; valptr<lineend && isspace(*valptr); valptr++);
/* continue to the end of value (FIXME: watching for trailing comments) */
for(valend=valptr; valend<lineend; valend++)
/* FIXME: N::P doesn't allow comments. Remove next line and parse_ini won't either */
/* FIXME: N::P doesn't allow comments here. Remove next line and parse_ini won't either */
if(*valend=='#') break;
--valend;
/* Finally trim off trailing spaces */
for(valend; isspace(*valend); valend--);
/* calculate the length of "--foo" */
opt_len=1+optend-optptr;
cfg_len=2+(opt_len);
/* 1-character params needs only one dash */
if (opt_len==1)
cfg_len=1+(opt_len);
else
cfg_len=2+(opt_len);
/* if valptr<lineend then we have to also allocate space for "=bar" */
if(valptr<lineend) {
equals=value=1;
@ -243,7 +247,14 @@ static int add_option(FILE *f, np_arg_list **optlst){
read_pos=0;
optnew->arg=(char *)malloc(cfg_len+1);
strncpy(&optnew->arg[read_pos], "--", 2); read_pos+=2;
/* 1-character params needs only one dash */
if (opt_len==1) {
strncpy(&optnew->arg[read_pos], "-", 1);
read_pos+=1;
} else {
strncpy(&optnew->arg[read_pos], "--", 2);
read_pos+=2;
}
strncpy(&optnew->arg[read_pos], optptr, opt_len); read_pos+=opt_len;
if(equals) optnew->arg[read_pos++]='=';
if(value) {

26
lib/tests/test_ini.c
View file

@ -36,12 +36,13 @@ list2str(np_arg_list *optlst)
char *optstr=NULL;
/* Put everything as a space-separated string */
asprintf(&optstr, "");
while (optlst) {
asprintf(&optstr, "%s%s ", optstr?optstr:"", optlst->arg);
asprintf(&optstr, "%s%s ", optstr, optlst->arg);
optlst=optlst->next;
}
/* Strip last whitespace */
optstr[strlen(optstr)-1]='\0';
if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0';
return optstr;
}
@ -51,7 +52,7 @@ main (int argc, char **argv)
{
char *optstr=NULL;
plan_tests(4);
plan_tests(9);
optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "config-tiny.ini's section as expected");
@ -61,42 +62,33 @@ main (int argc, char **argv)
ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name, without specific");
my_free(optstr);
/* This test currently crashes */
/*
optstr=np_get_defaults("section_unknown@./config-tiny.ini", "section");
optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section"));
ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name over specified one");
my_free(optstr);
*/
optstr=list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-tiny.ini's Section Two as expected");
my_free(optstr);
/* These tests currently crash parse_ini.c */
/*
optstr=np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk");
optstr=list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name");
my_free(optstr);
optstr=np_get_defaults("section2@./config-tiny.ini", "check_disk");
optstr=list2str(np_get_defaults("section2@./config-tiny.ini", "check_disk"));
ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section2 with whitespace before section name");
my_free(optstr);
optstr=np_get_defaults("section3@./config-tiny.ini", "check_disk");
optstr=list2str(np_get_defaults("section3@./config-tiny.ini", "check_disk"));
ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section3 with whitespace after section name");
my_free(optstr);
*/
optstr=list2str(np_get_defaults("check_mysql@./plugin.ini", "check_disk"));
ok( !strcmp(optstr, "--username=operator --password=secret"), "plugin.ini's check_mysql as expected");
my_free(optstr);
/* This test crashes at the moment. I think it is not expecting single character parameter names */
/*
optstr=np_get_defaults("check_mysql2@./config-tiny.ini", "check_disk");
optstr=list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
ok( !strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
my_free(optstr);
*/
return exit_status();
}