From: Roy Marples <roy@marples.name>
Date: Fri, 13 Mar 2015 20:21:29 +0000 (+0000)
Subject: Cast more for gcc and fix vendor class parsing.
X-Git-Tag: v6.8.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7a4dcf9c313dda9c3e7a8da58282c395e588315;p=thirdparty%2Fdhcpcd.git

Cast more for gcc and fix vendor class parsing.
---

diff --git a/if-options.c b/if-options.c
index 8f375a3c..b75b9544 100644
--- a/if-options.c
+++ b/if-options.c
@@ -794,7 +794,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
 		}
 		if (s != 0) {
 			ifo->userclass[ifo->userclass[0] + 1] = (uint8_t)s;
-			ifo->userclass[0] += (uint8_t)s + 1;
+			ifo->userclass[0] = (uint8_t)(ifo->userclass[0] + s +1);
 		}
 		break;
 	case 'v':
@@ -824,8 +824,10 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
 			ifo->vendor[0] = 0;
 		}
 
-		/* No need to strip the comma */
+		/* Strip and preserve the comma */
+		*p = '\0';
 		i = (int)strtoi(arg, NULL, 0, 1, 254, &e);
+		*p = ',';
 		if (e) {
 			syslog(LOG_ERR, "vendor option should be between"
 			    " 1 and 254 inclusive");
@@ -854,7 +856,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
 		if (s != 0) {
 			ifo->vendor[ifo->vendor[0] + 1] = (uint8_t)i;
 			ifo->vendor[ifo->vendor[0] + 2] = (uint8_t)s;
-			ifo->vendor[0] += (uint8_t)s + 2;
+			ifo->vendor[0] = (uint8_t)(ifo->vendor[0] + s + 2);
 		}
 		break;
 	case 'w':
@@ -2044,7 +2046,7 @@ read_config(struct dhcpcd_ctx *ctx,
 
 	vlen = dhcp_vendor((char *)ifo->vendorclassid + 1,
 	            sizeof(ifo->vendorclassid) - 1);
-	ifo->vendorclassid[0] = vlen == -1 ? 0 : (uint8_t)vlen;
+	ifo->vendorclassid[0] = (uint8_t)(vlen == -1 ? 0 : vlen);
 
 	buf = NULL;
 	buflen = 0;