emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount: fix "duplicate mount options in mtab" bug

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-17 15:08:12 +00:00
parent c0975199be
commit c889d2b786
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util-linux/mount.c
View File

@ -102,9 +102,27 @@ struct {
static void append_mount_options(char **oldopts, char *newopts)
{
if (*oldopts && **oldopts) {
char *temp = xasprintf("%s,%s",*oldopts,newopts);
free(*oldopts);
*oldopts = temp;
/* do not insert options which are already there */
while (newopts[0]) {
char *p;
int len = strlen(newopts);
p = strchr(newopts, ',');
if (p) len = p - newopts;
p = *oldopts;
while (1) {
if (!strncmp(p,newopts,len) && (p[len]==',' || p[len]==0))
goto skip;
p = strchr(p,',');
if(!p) break;
p++;
}
p = xasprintf("%s,%.*s", *oldopts, len, newopts);
free(*oldopts);
*oldopts = p;
skip:
newopts += len;
while (newopts[0] == ',') newopts++;
}
} else {
if (ENABLE_FEATURE_CLEAN_UP) free(*oldopts);
*oldopts = xstrdup(newopts);