1 files changed, 70 insertions, 58 deletions
diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 077c5b63..fa95c4d4 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-*
+ *
-* This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
+ * (at your option) any later version.
-*
+ *
-* This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
+ * GNU General Public License for more details.
-*
+ *
-* You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
+ *
-*****************************************************************************/
+ *****************************************************************************/
 #include "common.h"
 #include "utils_base.h"
@@ -40,36 +40,41 @@ void my_free(int *argc, char **newargv, char **argv) {
 #else
 void my_free(int *argc, char **newargv, char **argv) {
        /* Free stuff (and print while we're at it) */
-        int i, freeflag=1;
+        bool freeflag = true;
-        printf ("    Arg(%i): ", *argc+1);
+        printf("    Arg(%i): ", *argc + 1);
-        printf ("'%s' ", newargv[0]);
+        printf("'%s' ", newargv[0]);
-        for (i=1; i<*argc; i++) {
-                printf ("'%s' ", newargv[i]);
+        for (int i = 1; i < *argc; i++) {
+                printf("'%s' ", newargv[i]);
                /* Stop freeing when we get to the start of the original array */
                if (freeflag) {
-                        if (newargv[i] == argv[1])
+                        if (newargv[i] == argv[1]) {
-                                freeflag=0;
+                                freeflag = false;
-                        else
+                        } else {
                                free(newargv[i]);
+                        }
                }
        }
-        printf ("\n");
+        printf("\n");
        /* Free only if it's a different array */
-        if (newargv != argv) free(newargv);
+        if (newargv != argv) {
-        *argc=0;
+                free(newargv);
+        }
+        *argc = 0;
 }
 #endif
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
        if (i1 != i2) {
                printf("    Argument count doesn't match!\n");
                return 0;
        }
-        for (i=0; i<=i1; i++) {
-                if (a1[i]==NULL && a2[i]==NULL) continue;
+        for (int i = 0; i <= i1; i++) {
-                if (a1[i]==NULL || a2[i]==NULL) {
+                if (a1[i] == NULL && a2[i] == NULL) {
+                        continue;
+                }
+                if (a1[i] == NULL || a2[i] == NULL) {
                        printf("    Argument # %i null in one array!\n", i);
                        return 0;
                }
@@ -81,59 +86,66 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
        return 1;
 }
-int
+int main(int argc, char **argv) {
-main (int argc, char **argv)
-{
-        char **argv_new=NULL;
-        int i, argc_test;
        plan_tests(5);
+        char **argv_new = NULL;
+        int argc_test;
        {
-                char *argv_test[] = {"prog_name", (char *) NULL};
+                char *argv_test[] = {"prog_name", (char *)NULL};
-                argc_test=1;
+                argc_test = 1;
-                char *argv_known[] = {"prog_name", (char *) NULL};
+                char *argv_known[] = {"prog_name", (char *)NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");
                my_free(&argc_test, argv_new, argv_test);
        }
        {
-                char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
+                char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *)NULL};
-                argc_test=5;
+                argc_test = 5;
-                char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
+                char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *)NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");
                my_free(&argc_test, argv_new, argv_test);
        }
        {
-                char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *) NULL};
+                char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *)NULL};
-                argc_test=2;
+                argc_test = 2;
-                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char *) NULL};
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank",
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                                                          (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
                my_free(&argc_test, argv_new, argv_test);
        }
        {
-                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char *) NULL};
+                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts",
-                argc_test=4;
+                                                         "sect2@./config-opts.ini", (char *)NULL};
-                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char *) NULL};
+                argc_test = 4;
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that",
+                                                          (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
                my_free(&argc_test, argv_new, argv_test);
        }
        {
-                char *argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini", "--arg2", (char *) NULL};
+                char *argv_test[] = {"prog_name",
-                argc_test=6;
+                                                         "--arg1=val1",
-                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two", "--arg1=val1", "--arg2", (char *) NULL};
+                                                         "--extra-opts=@./config-opts.ini",
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                                                         "--extra-opts",
+                                                         "sect1@./config-opts.ini",
+                                                         "--arg2",
+                                                         (char *)NULL};
+                argc_test = 6;
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!",
+                                                          "--blank",   "--one=two", "--arg1=val1",
+                                                          "--arg2",    (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
                my_free(&argc_test, argv_new, argv_test);
        }
        return exit_status();
 }

diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c index 077c5b63..fa95c4d4 100644 --- a/lib/tests/test_opts1.c +++ b/lib/tests/test_opts1.c
@@ -1,19 +1,19 @@
1	/*****************************************************************************	1	/*****************************************************************************
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 3 of the License, or	5	* the Free Software Foundation, either version 3 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*	15	*
16	*****************************************************************************/	16	*****************************************************************************/
17		17
18	#include "common.h"	18	#include "common.h"
19	#include "utils_base.h"	19	#include "utils_base.h"
@@ -40,36 +40,41 @@ void my_free(int argc, char newargv, char *argv) {
40	#else	40	#else
41	void my_free(int argc, char newargv, char *argv) {	41	void my_free(int argc, char newargv, char *argv) {
42	/* Free stuff (and print while we're at it) */	42	/* Free stuff (and print while we're at it) */
43	int i, freeflag=1;	43	bool freeflag = true;
44	printf (" Arg(%i): ", *argc+1);	44	printf(" Arg(%i): ", *argc + 1);
45	printf ("'%s' ", newargv[0]);	45	printf("'%s' ", newargv[0]);
46	for (i=1; i<*argc; i++) {	46
47	printf ("'%s' ", newargv[i]);	47	for (int i = 1; i < *argc; i++) {
		48	printf("'%s' ", newargv[i]);
48	/* Stop freeing when we get to the start of the original array */	49	/* Stop freeing when we get to the start of the original array */
49	if (freeflag) {	50	if (freeflag) {
50	if (newargv[i] == argv[1])	51	if (newargv[i] == argv[1]) {
51	freeflag=0;	52	freeflag = false;
52	else	53	} else {
53	free(newargv[i]);	54	free(newargv[i]);
		55	}
54	}	56	}
55	}	57	}
56	printf ("\n");	58	printf("\n");
57	/* Free only if it's a different array */	59	/* Free only if it's a different array */
58	if (newargv != argv) free(newargv);	60	if (newargv != argv) {
59	*argc=0;	61	free(newargv);
		62	}
		63	*argc = 0;
60	}	64	}
61	#endif	65	#endif
62		66
63	int array_diff(int i1, char a1, int i2, char a2) {	67	int array_diff(int i1, char a1, int i2, char a2) {
64	int i;
65
66	if (i1 != i2) {	68	if (i1 != i2) {
67	printf(" Argument count doesn't match!\n");	69	printf(" Argument count doesn't match!\n");
68	return 0;	70	return 0;
69	}	71	}
70	for (i=0; i<=i1; i++) {	72
71	if (a1[i]==NULL && a2[i]==NULL) continue;	73	for (int i = 0; i <= i1; i++) {
72	if (a1[i]==NULL \|\| a2[i]==NULL) {	74	if (a1[i] == NULL && a2[i] == NULL) {
		75	continue;
		76	}
		77	if (a1[i] == NULL \|\| a2[i] == NULL) {
73	printf(" Argument # %i null in one array!\n", i);	78	printf(" Argument # %i null in one array!\n", i);
74	return 0;	79	return 0;
75	}	80	}
@@ -81,59 +86,66 @@ int array_diff(int i1, char a1, int i2, char a2) {
81	return 1;	86	return 1;
82	}	87	}
83		88
84	int	89	int main(int argc, char **argv) {
85	main (int argc, char **argv)
86	{
87	char **argv_new=NULL;
88	int i, argc_test;
89
90	plan_tests(5);	90	plan_tests(5);
91		91
		92	char **argv_new = NULL;
		93	int argc_test;
92	{	94	{
93	char argv_test[] = {"prog_name", (char ) NULL};	95	char argv_test[] = {"prog_name", (char )NULL};
94	argc_test=1;	96	argc_test = 1;
95	char argv_known[] = {"prog_name", (char ) NULL};	97	char argv_known[] = {"prog_name", (char )NULL};
96	argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");	98	argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
97	ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");	99	ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");
98	my_free(&argc_test, argv_new, argv_test);	100	my_free(&argc_test, argv_new, argv_test);
99	}	101	}
100		102
101	{	103	{
102	char argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char ) NULL};	104	char argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char )NULL};
103	argc_test=5;	105	argc_test = 5;
104	char argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char ) NULL};	106	char argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char )NULL};
105	argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");	107	argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
106	ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");	108	ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");
107	my_free(&argc_test, argv_new, argv_test);	109	my_free(&argc_test, argv_new, argv_test);
108	}	110	}
109		111
110	{	112	{
111	char argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char ) NULL};	113	char argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char )NULL};
112	argc_test=2;	114	argc_test = 2;
113	char argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char ) NULL};	115	char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank",
114	argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");	116	(char *)NULL};
		117	argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
115	ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");	118	ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
116	my_free(&argc_test, argv_new, argv_test);	119	my_free(&argc_test, argv_new, argv_test);
117	}	120	}
118		121
119	{	122	{
120	char argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char ) NULL};	123	char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts",
121	argc_test=4;	124	"sect2@./config-opts.ini", (char *)NULL};
122	char argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char ) NULL};	125	argc_test = 4;
123	argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");	126	char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that",
		127	(char *)NULL};
		128	argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
124	ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");	129	ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
125	my_free(&argc_test, argv_new, argv_test);	130	my_free(&argc_test, argv_new, argv_test);
126	}	131	}
127		132
128	{	133	{
129	char argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini", "--arg2", (char ) NULL};	134	char *argv_test[] = {"prog_name",
130	argc_test=6;	135	"--arg1=val1",
131	char argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two", "--arg1=val1", "--arg2", (char ) NULL};	136	"--extra-opts=@./config-opts.ini",
132	argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");	137	"--extra-opts",
		138	"sect1@./config-opts.ini",
		139	"--arg2",
		140	(char *)NULL};
		141	argc_test = 6;
		142	char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!",
		143	"--blank", "--one=two", "--arg1=val1",
		144	"--arg2", (char *)NULL};
		145	argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
133	ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");	146	ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
134	my_free(&argc_test, argv_new, argv_test);	147	my_free(&argc_test, argv_new, argv_test);
135	}	148	}
136		149
137	return exit_status();	150	return exit_status();
138	}	151	}
139