allow empty strings in argument parser

Max Kellermann <max@duempel.org>

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 2d2f8b0423a1aa0332322924a8e2c6a2ffd50ffe..570bd51523240cf23306a9bc691120a668fa7c83 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -366,14 +366,12 @@ int main(int argc, char *argv[])
                        for (curchar = parsestart; *curchar; curchar++) {
                                char param_buffer[1024];
 
-                               if (escaped) {
-                                       param_buffer[param_len++] = *curchar;
-                                       escaped = 0;
-                                       continue;
-                               }
-
                                if (quote_open) {
-                                       if (*curchar == '\\') {
+                                       if (escaped) {
+                                               param_buffer[param_len++] = *curchar;
+                                               escaped = 0;
+                                               continue;
+                                       } else if (*curchar == '\\') {
                                                escaped = 1;
                                                continue;
                                        } else if (*curchar == '"') {

diff --git a/iptables-restore.c b/iptables-restore.c
index 2522b0f53c2becde71d1487d7712f29de5b68de5..44263ceefa0079c0ccc443db73f7dd34c6abae33 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -373,14 +373,12 @@ main(int argc, char *argv[])
                        for (curchar = parsestart; *curchar; curchar++) {
                                char param_buffer[1024];
 
-                               if (escaped) {
-                                       param_buffer[param_len++] = *curchar;
-                                       escaped = 0;
-                                       continue;
-                               }
-
                                if (quote_open) {
-                                       if (*curchar == '\\') {
+                                       if (escaped) {
+                                               param_buffer[param_len++] = *curchar;
+                                               escaped = 0;
+                                               continue;
+                                       } else if (*curchar == '\\') {
                                                escaped = 1;
                                                continue;
                                        } else if (*curchar == '"') {