mirror of
https://github.com/topjohnwu/ndk-busybox.git
synced 2024-12-13 14:36:00 +00:00
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>
This commit is contained in:
parent
254e47372f
commit
43b9235f66
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user