From a2ed880a19d0861342b3515721804b18d698bf44 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 2 Aug 2018 17:05:17 +0200 Subject: xshared: Consolidate argv construction routines Implementations were equal in {ip,ip6,x}tables-restore.c. The one in iptables-xml.c differed slightly. For now, collect all features together. Maybe it would make sense to migrate iptables-xml.c to using add_param_to_argv() at some point and therefore extend the latter to store whether a given parameter was quoted or not. While being at it, a few improvements were done: * free_argv() now also resets 'newargc' variable, so users don't have to do that anymore. * Indenting level in add_param_to_argv() was reduced a bit. * That long error message is put into a single line to aid in grepping for it. * Explicit call to exit() after xtables_error() is removed since the latter does not return anyway. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/ip6tables-restore.c | 110 +++---------------------------------------- 1 file changed, 7 insertions(+), 103 deletions(-) (limited to 'iptables/ip6tables-restore.c') diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c index f2bd93d7..51294f24 100644 --- a/iptables/ip6tables-restore.c +++ b/iptables/ip6tables-restore.c @@ -79,99 +79,6 @@ static struct xtc_handle *create_handle(const char *tablename) return handle; } -/* global new argv and argc */ -static char *newargv[255]; -static int newargc; - -/* function adding one argument to newargv, updating newargc - * returns true if argument added, false otherwise */ -static int add_argv(char *what) { - DEBUGP("add_argv: %s\n", what); - if (what && newargc + 1 < ARRAY_SIZE(newargv)) { - newargv[newargc] = strdup(what); - newargv[++newargc] = NULL; - return 1; - } else { - xtables_error(PARAMETER_PROBLEM, - "Parser cannot handle more arguments\n"); - return 0; - } -} - -static void free_argv(void) { - int i; - - for (i = 0; i < newargc; i++) - free(newargv[i]); -} - -static void add_param_to_argv(char *parsestart) -{ - int quote_open = 0, escaped = 0, param_len = 0; - char param_buffer[1024], *curchar; - - /* After fighting with strtok enough, here's now - * a 'real' parser. According to Rusty I'm now no - * longer a real hacker, but I can live with that */ - - for (curchar = parsestart; *curchar; curchar++) { - if (quote_open) { - if (escaped) { - param_buffer[param_len++] = *curchar; - escaped = 0; - continue; - } else if (*curchar == '\\') { - escaped = 1; - continue; - } else if (*curchar == '"') { - quote_open = 0; - *curchar = ' '; - } else { - param_buffer[param_len++] = *curchar; - continue; - } - } else { - if (*curchar == '"') { - quote_open = 1; - continue; - } - } - - if (*curchar == ' ' - || *curchar == '\t' - || * curchar == '\n') { - if (!param_len) { - /* two spaces? */ - continue; - } - - param_buffer[param_len] = '\0'; - - /* check if table name specified */ - if ((param_buffer[0] == '-' && - param_buffer[1] != '-' && - strchr(param_buffer, 't')) || - (!strncmp(param_buffer, "--t", 3) && - !strncmp(param_buffer, "--table", strlen(param_buffer)))) { - xtables_error(PARAMETER_PROBLEM, - "The -t option (seen in line %u) cannot be " - "used in ip6tables-restore.\n", line); - exit(1); - } - - add_argv(param_buffer); - param_len = 0; - } else { - /* regular character, copy to buffer */ - param_buffer[param_len++] = *curchar; - - if (param_len >= sizeof(param_buffer)) - xtables_error(PARAMETER_PROBLEM, - "Parameter too long!"); - } - } -} - int ip6tables_restore_main(int argc, char *argv[]) { struct xtc_handle *handle = NULL; @@ -414,9 +321,6 @@ int ip6tables_restore_main(int argc, char *argv[]) char *bcnt = NULL; char *parsestart; - /* reset the newargv */ - newargc = 0; - if (buffer[0] == '[') { /* we have counters in our input */ ptr = strchr(buffer, ']'); @@ -444,17 +348,17 @@ int ip6tables_restore_main(int argc, char *argv[]) parsestart = buffer; } - add_argv(argv[0]); - add_argv("-t"); - add_argv(curtable); + add_argv(argv[0], 0); + add_argv("-t", 0); + add_argv(curtable, 0); if (counters && pcnt && bcnt) { - add_argv("--set-counters"); - add_argv((char *) pcnt); - add_argv((char *) bcnt); + add_argv("--set-counters", 0); + add_argv((char *) pcnt, 0); + add_argv((char *) bcnt, 0); } - add_param_to_argv(parsestart); + add_param_to_argv(parsestart, line); DEBUGP("calling do_command6(%u, argv, &%s, handle):\n", newargc, curtable); -- cgit v1.2.3