From: Roy Marples <roy@marples.name>
Date: Thu, 20 Dec 2012 19:35:26 +0000 (+0000)
Subject: Preserve the space in static routes on the command line.
X-Git-Tag: v5.6.7~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c85e58ae54defadcf8f16caaef09e23fddfe129;p=thirdparty%2Fdhcpcd.git

Preserve the space in static routes on the command line.
Thanks to br@waldteufel.eu.
---

diff --git a/if-options.c b/if-options.c
index 69d1a990..372ee24f 100644
--- a/if-options.c
+++ b/if-options.c
@@ -341,7 +341,7 @@ static int
 parse_option(struct if_options *ifo, int opt, const char *arg)
 {
 	int i;
-	char *p = NULL, *np;
+	char *p = NULL, *fp, *np;
 	ssize_t s;
 	struct in_addr addr, addr2;
 	struct rt *rt;
@@ -654,7 +654,7 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
 		    strncmp(arg, "classless_static_routes=", strlen("classless_static_routes=")) == 0 ||
 		    strncmp(arg, "ms_classless_static_routes=", strlen("ms_classless_static_routes=")) == 0)
 		{
-			np = strchr(p, ' ');
+			fp = np = strchr(p, ' ');
 			if (np == NULL) {
 				syslog(LOG_ERR, "all routes need a gateway");
 				return -1;
@@ -674,7 +674,11 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
 			rt->next = NULL;
 			if (parse_addr(&rt->dest, &rt->net, p) == -1 ||
 			    parse_addr(&rt->gate, NULL, np) == -1)
+			{
+				*fp = ' ';
 				return -1;
+			}
+			*fp = ' ';
 		} else if (strncmp(arg, "routers=", strlen("routers=")) == 0) {
 			if (ifo->routes == NULL) {
 				rt = ifo->routes = xzalloc(sizeof(*rt));