annotate cfgparser.c @ 177:554c6e5f36ef

... :)
author szabii
date Tue, 20 Mar 2001 22:55:50 +0000
parents 53f289e99102
children 6f890e61739b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
1 /*
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
2 * command line and config file parser
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
3 */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
4
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
5 //#define DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
6
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
7 #include <stdlib.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
8 #include <stdio.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
9 #include <ctype.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
10 #include <unistd.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
11 #include <fcntl.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
12 #include <string.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
13
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
14 #define ERR_NOT_AN_OPTION -1
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
15 #define ERR_MISSING_PARAM -2
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
16 #define ERR_OUT_OF_RANGE -3
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
17 #define ERR_FUNC_ERR -4
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
18
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
19 #define COMMAND_LINE 0
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
20 #define CONFIG_FILE 1
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
21
177
szabii
parents: 167
diff changeset
22 #define MAX_RECURSION_DEPTH 8
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
23
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
24 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
25 #include <assert.h>
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
26 #endif
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
27
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
28 #include "cfgparser.h"
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
29
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
30 static struct config *config;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
31 static int nr_options; /* number of options in 'conf' */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
32 static int parser_mode; /* COMMAND_LINE or CONFIG_FILE */
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
33 static int recursion_depth = 0;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
34
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
35 static int init_conf(struct config *conf, int mode)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
36 {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
37 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
38 assert(conf != NULL);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
39 #endif
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
40
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
41 /* calculate the number of options in 'conf' */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
42 for (nr_options = 0; conf[nr_options].name != NULL; nr_options++)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
43 /* NOTHING */;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
44
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
45 config = conf;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
46 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
47 if (mode != COMMAND_LINE && mode != CONFIG_FILE) {
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
48 printf("init_conf: wrong mode!\n");
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
49 return -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
50 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
51 #endif
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
52 parser_mode = mode;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
53 return 1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
54 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
55
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
56 static int read_option(char *opt, char *param)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
57 {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
58 int i;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
59 int tmp_int;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
60 float tmp_float;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
61 int ret = -1;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
62
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
63 for (i = 0; i < nr_options; i++) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
64 if (!strcasecmp(opt, config[i].name))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
65 break;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
66 }
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
67 if (i == nr_options) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
68 printf("invalid option:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
69 ret = ERR_NOT_AN_OPTION;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
70 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
71 }
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
72 if (config[i].flags & CONF_NOCFG && parser_mode == CONFIG_FILE) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
73 printf("this option can only be used on command line:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
74 ret = ERR_NOT_AN_OPTION;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
75 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
76 }
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
77 if (config[i].flags & CONF_NOCMD && parser_mode == COMMAND_LINE) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
78 printf("this option can only be used in config file:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
79 ret = ERR_NOT_AN_OPTION;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
80 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
81 }
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
82
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
83 switch (config[i].type) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
84 case CONF_TYPE_FLAG:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
85 /* flags need a parameter in config file */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
86 if (parser_mode == CONFIG_FILE) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
87 if (!strcasecmp(param, "yes") || /* any other language? */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
88 !strcasecmp(param, "ja") ||
161
9008302e2dc0 Added support for spanish (Yes, I'm a C programer also ;o)
telenieko
parents: 160
diff changeset
89 !strcasecmp(param, "si") ||
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
90 !strcasecmp(param, "igen") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
91 !strcasecmp(param, "y") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
92 !strcasecmp(param, "i") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
93 !strcmp(param, "1"))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
94 *((int *) config[i].p) = config[i].max;
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
95 else if (!strcasecmp(param, "no") ||
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
96 !strcasecmp(param, "nein") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
97 !strcasecmp(param, "nicht") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
98 !strcasecmp(param, "nem") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
99 !strcasecmp(param, "n") ||
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
100 !strcmp(param, "0"))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
101 *((int *) config[i].p) = config[i].min;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
102 else {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
103 printf("invalid parameter for flag:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
104 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
105 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
106 }
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
107 ret = 1;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
108 } else { /* parser_mode == COMMAND_LINE */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
109 *((int *) config[i].p) = config[i].max;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
110 ret = 0;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
111 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
112 break;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
113 case CONF_TYPE_INT:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
114 if (param == NULL)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
115 goto err_missing_param;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
116 if (!isdigit(*param)) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
117 printf("parameter must be an integer:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
118 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
119 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
120 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
121
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
122 tmp_int = atoi(param);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
123
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 152
diff changeset
124 if (config[i].flags & CONF_MIN)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
125 if (tmp_int < config[i].min) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
126 printf("parameter must be >= %d:\n", (int) config[i].min);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
127 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
128 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
129 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
130
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 152
diff changeset
131 if (config[i].flags & CONF_MAX)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
132 if (tmp_int > config[i].max) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
133 printf("parameter must be <= %d:\n", (int) config[i].max);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
134 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
135 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
136 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
137
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
138 *((int *) config[i].p) = tmp_int;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
139 ret = 1;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
140 break;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
141 case CONF_TYPE_FLOAT:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
142 if (param == NULL)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
143 goto err_missing_param;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
144 if (!isdigit(*param)) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
145 printf("parameter must be a floating point number:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
146 ret = ERR_MISSING_PARAM;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
147 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
148 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
149
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
150 tmp_float = atof(param);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
151
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 152
diff changeset
152 if (config[i].flags & CONF_MIN)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
153 if (tmp_float < config[i].min) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
154 printf("parameter must be >= %f:\n", config[i].min);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
155 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
156 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
157 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
158
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 152
diff changeset
159 if (config[i].flags & CONF_MAX)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
160 if (tmp_float > config[i].max) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
161 printf("parameter must be <= %f:\n", config[i].max);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
162 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
163 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
164 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
165
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
166 *((float *) config[i].p) = tmp_float;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
167 ret = 1;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
168 break;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
169 case CONF_TYPE_STRING:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
170 if (param == NULL)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
171 goto err_missing_param;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
172
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 152
diff changeset
173 if (config[i].flags & CONF_MIN)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
174 if (strlen(param) < config[i].min) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
175 printf("parameter must be >= %d chars:\n",
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
176 (int) config[i].min);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
177 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
178 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
179 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
180
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 152
diff changeset
181 if (config[i].flags & CONF_MAX)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
182 if (strlen(param) > config[i].max) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
183 printf("parameter must be <= %d chars:\n",
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
184 (int) config[i].max);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
185 ret = ERR_OUT_OF_RANGE;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
186 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
187 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
188
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
189 *((char **) config[i].p) = strdup(param);
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
190 ret = 1;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
191 break;
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
192 case CONF_TYPE_FUNC_PARAM:
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
193 if (param == NULL)
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
194 goto err_missing_param;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
195 if ((((cfg_func_param_t) config[i].p)(config + i, param)) < 0) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
196 ret = ERR_FUNC_ERR;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
197 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
198 }
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
199 ret = 1;
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
200 break;
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
201 case CONF_TYPE_FUNC:
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
202 if ((((cfg_func_t) config[i].p)(config + i)) < 0) {
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
203 ret = ERR_FUNC_ERR;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
204 goto out;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
205 }
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
206 ret = 0;
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
207 break;
152
372a9a836e86 cfgparser fix
szabii
parents: 151
diff changeset
208 case CONF_TYPE_PRINT:
372a9a836e86 cfgparser fix
szabii
parents: 151
diff changeset
209 printf("%s", (char *) config[i].p);
372a9a836e86 cfgparser fix
szabii
parents: 151
diff changeset
210 exit(1);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
211 default:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
212 printf("picsaba\n");
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
213 break;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
214 }
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
215 out:
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
216 return ret;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
217 err_missing_param:
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
218 printf("missing parameter:\n");
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
219 ret = ERR_MISSING_PARAM;
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
220 goto out;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
221 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
222
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
223 int parse_config_file(struct config *conf, char *conffile)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
224 {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
225 #define PRINT_LINENUM printf("%s(%d): ", conffile, line_num)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
226 #define MAX_LINE_LEN 1000
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
227 #define MAX_OPT_LEN 100
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
228 #define MAX_PARAM_LEN 100
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
229 FILE *fp;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
230 char *line;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
231 char opt[MAX_OPT_LEN];
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
232 char param[MAX_PARAM_LEN];
167
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
233 char c; /* for the "" and '' check */
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
234 int tmp;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
235 int line_num = 0;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
236 int line_pos; /* line pos */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
237 int opt_pos; /* opt pos */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
238 int param_pos; /* param pos */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
239 int ret = 1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
240
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
241 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
242 assert(conffile != NULL);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
243 #endif
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
244 if (++recursion_depth > MAX_RECURSION_DEPTH) {
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
245 printf("too deep 'include'. check your configfiles\n");
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
246 return -1;
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
247 }
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
248
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
249 printf("Reading config file: %s\n", conffile);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
250
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
251 if (init_conf(conf, CONFIG_FILE) == -1) {
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
252 ret = -1;
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
253 goto out;
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
254 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
255
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
256 if ((line = (char *) malloc(MAX_LINE_LEN)) == NULL) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
257 perror("parse_config_file: can't get memory for 'line'");
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
258 ret = -1;
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
259 goto out;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
260 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
261
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
262 if ((fp = fopen(conffile, "r")) == NULL) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
263 perror("parse_config_file: can't open filename");
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
264 free(line);
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
265 ret = 0;
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
266 goto out;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
267 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
268
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
269 while (fgets(line, MAX_LINE_LEN, fp)) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
270 line_num++;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
271 line_pos = 0;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
272
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
273 /* skip whitespaces */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
274 while (isspace(line[line_pos]))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
275 ++line_pos;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
276
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
277 /* EOL / comment */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
278 if (line[line_pos] == '\0' || line[line_pos] == '#')
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
279 continue;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
280
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
281 /* read option. accept char if isalnum(char) */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
282 for (opt_pos = 0; isalnum(line[line_pos]); /* NOTHING */) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
283 opt[opt_pos++] = line[line_pos++];
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
284 if (opt_pos >= MAX_OPT_LEN) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
285 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
286 printf("too long option\n");
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
287 ret = -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
288 continue;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
289 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
290 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
291 if (opt_pos == 0) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
292 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
293 printf("parse error\n");
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
294 ret = -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
295 continue;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
296 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
297 opt[opt_pos] = '\0';
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
298 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
299 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
300 printf("option: %s\n", opt);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
301 #endif
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
302
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
303 /* skip whitespaces */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
304 while (isspace(line[line_pos]))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
305 ++line_pos;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
306
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
307 /* check '=' */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
308 if (line[line_pos++] != '=') {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
309 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
310 printf("option without parameter\n");
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
311 ret = -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
312 continue;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
313 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
314
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
315 /* whitespaces... */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
316 while (isspace(line[line_pos]))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
317 ++line_pos;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
318
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
319 /* read the parameter */
167
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
320 if (line[line_pos] == '"' || line[line_pos] == '\'') {
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
321 c = line[line_pos];
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
322 ++line_pos;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
323 for (param_pos = 0; line[line_pos] != c; /* NOTHING */) {
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
324 param[param_pos++] = line[line_pos++];
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
325 if (param_pos >= MAX_PARAM_LEN) {
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
326 PRINT_LINENUM;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
327 printf("too long parameter\n");
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
328 ret = -1;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
329 continue;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
330 }
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
331 }
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
332 line_pos++; /* skip the closing " or ' */
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
333 } else {
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
334 for (param_pos = 0; isprint(line[line_pos]) && !isspace(line[line_pos])
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
335 && line[line_pos] != '#'; /* NOTHING */) {
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
336 param[param_pos++] = line[line_pos++];
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
337 if (param_pos >= MAX_PARAM_LEN) {
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
338 PRINT_LINENUM;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
339 printf("too long parameter\n");
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
340 ret = -1;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
341 continue;
53f289e99102 parameter can be in quotes in config file
szabii
parents: 166
diff changeset
342 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
343 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
344 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
345 param[param_pos] = '\0';
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
346
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
347 /* did we read a parameter? */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
348 if (param_pos == 0) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
349 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
350 printf("option without parameter\n");
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
351 ret = -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
352 continue;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
353 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
354 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
355 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
356 printf("parameter: %s\n", param);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
357 #endif
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
358 /* now, check if we have some more chars on the line */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
359 /* whitespace... */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
360 while (isspace(line[line_pos]))
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
361 ++line_pos;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
362
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
363 /* EOL / comment */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
364 if (line[line_pos] != '\0' && line[line_pos] != '#') {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
365 PRINT_LINENUM;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
366 printf("extra characters on line: %s\n", line+line_pos);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
367 ret = -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
368 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
369
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
370 tmp = read_option(opt, param);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
371 switch (tmp) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
372 case ERR_NOT_AN_OPTION:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
373 case ERR_MISSING_PARAM:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
374 case ERR_OUT_OF_RANGE:
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
375 case ERR_FUNC_ERR:
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
376 PRINT_LINENUM;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
377 printf("%s\n", opt);
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
378 ret = -1;
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
379 continue;
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
380 /* break */
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
381 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
382 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
383
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
384 free(line);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
385 fclose(fp);
166
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
386 out:
6b79d801e183 include recursion check
szabii
parents: 161
diff changeset
387 --recursion_depth;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
388 return ret;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
389 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
390
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
391 int parse_command_line(struct config *conf, int argc, char **argv, char **envp, char **filename)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
392 {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
393 int i;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
394 int found_filename = 0;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
395 int tmp;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
396 char *opt;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
397
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
398 #ifdef DEBUG
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
399 assert(argv != NULL);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
400 assert(envp != NULL);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
401 assert(argc >= 1);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
402 #endif
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
403
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
404 if (init_conf(conf, COMMAND_LINE) == -1)
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
405 return -1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
406
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
407 for (i = 1; i < argc; i++) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
408 opt = argv[i];
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
409 if (*opt != '-')
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
410 goto not_an_option;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
411
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
412 /* remove trailing '-' */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
413 opt++;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
414
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
415 tmp = read_option(opt, argv[i + 1]);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
416
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
417 switch (tmp) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
418 case ERR_NOT_AN_OPTION:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
419 not_an_option:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
420 /* opt is not an option -> treat it as a filename */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
421 if (found_filename) {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
422 /* we already have a filename */
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
423 goto err_out;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
424 } else {
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
425 found_filename = 1;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
426 *filename = argv[i];
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
427 printf("parse_command_line: found filename: %s\n", *filename);
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
428 continue; /* next option */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
429 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
430 break;
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
431 case ERR_MISSING_PARAM:
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
432 case ERR_OUT_OF_RANGE:
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
433 case ERR_FUNC_ERR:
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
434 goto err_out;
150
2f3e01a1fd87 cfgparse fixes
szabii
parents: 147
diff changeset
435 /* break; */
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
436 }
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
437
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
438 i += tmp; /* we already processed the params (if there was any) */
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
439 }
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
440 return found_filename;
160
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
441 err_out:
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
442 printf("parse_command_line: %s\n", argv[i]);
5f0c50a9e347 cfgparse fix...
szabii
parents: 158
diff changeset
443 return -1;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
444 }