upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-05-28 04:35:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix for last commit - I accidentaly broke my local Makefile and tests weren't being re-compiled.

Browse source 
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1968 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Thomas Guyot-Sionnest 2008-03-31 05:31:14 +00:00
parent 8aa5ec317a
commit 20a8bf1a3f
6 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/extra_opts.c
View file

@ -26,10 +26,9 @@
*****************************************************************************/
#include "common.h"
#include "extra_opts.h"
#include "parse_ini.h"
#include "utils_base.h"
#include <ctype.h>
#include "parse_ini.h"
#include "extra_opts.h"
/* FIXME: copied from utils.h; we should move a bunch of libs! */
int
@ -66,7 +65,7 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name){
/* Delete the extra opts argument */
for(j=i;j<*argc;j++) argv[j]=argv[j+1];
i--;
*argc--;
*argc-=1;
}else if(strcmp(argv[i], "--extra-opts")==0){
if(!is_option(argv[i+1])){
/* It is a argument with separate value */
@ -82,7 +81,7 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name){
/* Delete the extra opts argument */
for(j=i;j<*argc;j++) argv[j]=argv[j+1];
i--;
*argc--;
*argc-=1;
}
}
@ -102,7 +101,10 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name){
while(ea1=ea1->next) ea_num++;
}else{
ea_tmp=extra_args;
while(ea_tmp=ea_tmp->next) ea_num++;
while(ea_tmp->next) {
ea_tmp=ea_tmp->next;
ea_num++;
}
ea_tmp->next=ea1;
}
ea1=ea_tmp=NULL;

1
lib/extra_opts.h
View file

@ -17,3 +17,4 @@
char **np_extra_opts(int *argc, char **argv, const char *plugin_name);
#endif /* _EXTRA_OPTS_H_ */

2
lib/parse_ini.c
View file

@ -26,8 +26,8 @@
*****************************************************************************/
#include "common.h"
#include "parse_ini.h"
#include "utils_base.h"
#include "parse_ini.h"
#include <ctype.h>
#include <sys/types.h>

1
lib/parse_ini.h
View file

@ -59,3 +59,4 @@ typedef struct np_arg_el {
np_arg_list* np_get_defaults(const char *locator, const char *default_section);
#endif /* _PARSE_INI_H_ */

2
lib/tests/test_ini.c
View file

@ -18,8 +18,8 @@
*****************************************************************************/
#include "common.h"
#include "parse_ini.h"
#include "utils_base.h"
#include "parse_ini.h"
#include "tap.h"

18
lib/tests/test_opts.c
View file

@ -18,8 +18,8 @@
*****************************************************************************/
#include "common.h"
#include "extra_opts.h"
#include "utils_base.h"
#include "extra_opts.h"
#include "tap.h"
@ -119,7 +119,7 @@ main (int argc, char **argv)
argv_known[2] = "--something else=oops";
argv_known[3] = "--this=that";
argv_known[4] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_disk");
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
ok(array_diff(argc_test, argv_test, 4, argv_known), "Only extra opts specified twice");
my_free(&argc_test,argv_test);
@ -141,7 +141,7 @@ main (int argc, char **argv)
argv_known[5] = "--arg1=val1";
argv_known[6] = "--arg2";
argv_known[7] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_disk");
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
ok(array_diff(argc_test, argv_test, 7, argv_known), "twice extra opts using two sections");
my_free(&argc_test,argv_test);
@ -162,7 +162,7 @@ main (int argc, char **argv)
argv_known[2] = "--arg3";
argv_known[3] = "val2";
argv_known[4] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_missing");
argv_test=np_extra_opts(&argc_test, argv_test, "check_missing");
ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 1");
my_free(&argc_test,argv_test);
@ -181,7 +181,7 @@ main (int argc, char **argv)
argv_known[2] = "--arg3";
argv_known[3] = "val2";
argv_known[4] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_missing");
argv_test=np_extra_opts(&argc_test, argv_test, "check_missing");
ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 2");
my_free(&argc_test,argv_test);
@ -199,7 +199,7 @@ main (int argc, char **argv)
argv_known[2] = "--arg3";
argv_known[3] = "val2";
argv_known[4] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_missing");
argv_test=np_extra_opts(&argc_test, argv_test, "check_missing");
ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 3");
my_free(&argc_test,argv_test);
@ -219,7 +219,7 @@ main (int argc, char **argv)
argv_known[3] = "--arg3";
argv_known[4] = "val2";
argv_known[5] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_disk");
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1");
my_free(&argc_test,argv_test);
@ -238,7 +238,7 @@ main (int argc, char **argv)
argv_known[3] = "--arg3";
argv_known[4] = "val2";
argv_known[5] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_disk");
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 2");
my_free(&argc_test,argv_test);
@ -257,7 +257,7 @@ main (int argc, char **argv)
argv_known[3] = "--arg3";
argv_known[4] = "val2";
argv_known[5] = NULL;
argv_test=np_extra_opts(argc_test, argv_test, "check_disk");
argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3");
my_free(&argc_test,argv_test);