summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-05-14 04:29:15 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2018-05-14 08:46:00 (GMT)
commit43b9235f66aa56bb884c13443d9e7d56003b5c36 (patch)
treefaaf393bf9a5d1328b159ee1e123fd99e1ff2b98
parent254e47372f77ea1070be6dbb44b5c45770115a07 (diff)
downloadbusybox-43b9235f66aa56bb884c13443d9e7d56003b5c36.tar.gz
busybox-43b9235f66aa56bb884c13443d9e7d56003b5c36.tar.bz2
udhcp: fix use of trim() in udhcp_str2optset()
trim() modifies the string in place if needed and returns a pointer to the end of the resulting string. Update udhcp_str2optset() so it no longer sets the value of 'val' to the return value of trim(). Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/udhcp/common.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index fbf9c68..b7c04da 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -489,9 +489,10 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg, const struct dh
int length;
char *val;
- if (optflag->flags == OPTION_BIN)
- val = trim(strtok(NULL, "")); /* do not split "'q w e'" */
- else
+ if (optflag->flags == OPTION_BIN) {
+ val = strtok(NULL, ""); /* do not split "'q w e'" */
+ trim(val);
+ } else
val = strtok(NULL, ", \t");
if (!val)
break;