From: Roy Marples <roy@marples.name>
Date: Mon, 21 Apr 2008 09:53:18 +0000 (+0000)
Subject: Trim trailing whitespace.
X-Git-Tag: v4.0.2~464
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbebcb73d1df238e4a04dd894cf9b52df67aef95;p=thirdparty%2Fdhcpcd.git

Trim trailing whitespace.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 3c072631..761eeaa5 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -360,7 +360,7 @@ main(int argc, char **argv)
 	int pidfd = -1;
 	int sig = 0;
 	int retval = EXIT_FAILURE;
-	char *line, *option, *buffer = NULL;
+	char *line, *option, *p, *buffer = NULL;
 	size_t len = 0;
 	FILE *f;
 
@@ -393,10 +393,17 @@ main(int argc, char **argv)
 			option = strsep(&line, " ");
 			if (!option || *option == '\0' || *option == '#')
 				continue;
-			/* Trim whitespace */
-			if (line)
-				while (*line == ' ' || *line == '\t')
+			/* Trim leading whitespace */
+			if (line) {
+				while (*line != '\0' && (*line == ' ' || *line == '\t'))
 					line++;
+			}
+			/* Trim trailing whitespace */
+			if (line && *line) {
+				p = line + strlen(line) - 1;
+				while (p != line && (*p == ' ' || *p == '\t'))
+					*p-- = '\0';
+			}
 			r = parse_config_line(option, line, options);
 			if (r != 1)
 				break;