root/trunk/freewrt/package/busybox/patches/970-ifupdown-whitespace.patch

busybox-1.4.2/networking/ifupdown.c

@@ -658 +658 @@
-        while ((buf = xmalloc_getline(f)) != NULL) {
-                char *buf_ptr = buf;
-
+                /* skip comments -- tg@freewrt.org */
+                {
+                        unsigned char inquote = 0;
+ skipcommloop:
+                        if (inquote == 0)
+                                switch (*buf_ptr) {
+                                case '\'':
+                                case '\\':
+                                case '"':
+                                        inquote = *buf_ptr;
+                                        break;
+                                case '#':
+                                        *buf_ptr = '\0';
+                                        goto skipcommend;
+                                }
+                        else if (inquote == '\\')
+                                inquote = 0;
+                        else if ((inquote == '\'') && (*buf_ptr == '\''))
+                                inquote = 0;
+                        else if (inquote == '"')
+                                switch (*buf_ptr) {
+                                case '"':
+                                        inquote = 0;
+                                        break;
+                                case '\\':
+                                        /* escape one via backslash inside " */
+                                        inquote = '!';
+                                        break;
+                                }
+                        else if (inquote == '!')
+                                inquote = '"';
+                        buf_ptr++;
+                        if (*buf_ptr)
+                                goto skipcommloop;
+ skipcommend:           /* required */;
+                }
+
+                /* rtrim -- tg@freewrt.org */
+                buf_ptr = buf + strlen(buf) - 1;
+                while ((buf_ptr >= buf) && /* can't be '\n' */
+                    ((*buf_ptr == ' ') || (*buf_ptr == '\t')))
+                        --buf_ptr;
+                *++buf_ptr = '\0';
+
+                buf_ptr = buf;
-                firstword = next_word(&buf_ptr);
-                if (firstword == NULL) {
-                        free(buf);