aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2017-07-11 05:16:09 -0500
committerRob Landley <rob@landley.net>2017-07-11 05:16:09 -0500
commit58fea0ea98ed7145f15acc851b8dbaa17e111ebd (patch)
tree9cdb9e7462f22511630e4338e4a4138d9c5cd5d7
parentd1e85b9c4688c52a5c97dfe097fb932f0c7c3bbd (diff)
downloadtoybox-58fea0ea98ed7145f15acc851b8dbaa17e111ebd.tar.gz
comma_scan()'s clean option wasn't removing entry at end of list.
-rw-r--r--lib/getmountlist.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/getmountlist.c b/lib/getmountlist.c
index 332852a8..f7d58ab6 100644
--- a/lib/getmountlist.c
+++ b/lib/getmountlist.c
@@ -97,7 +97,10 @@ int comma_scan(char *optlist, char *opt, int clean)
no = 2*(*s == 'n' && s[1] == 'o');
if (optlen == len-no && !strncmp(opt, s+no, optlen)) {
got = !no;
- if (clean && optlist) memmove(s, optlist, strlen(optlist)+1);
+ if (clean) {
+ if (optlist) memmove(s, optlist, strlen(optlist)+1);
+ else *s = 0;
+ }
}
}