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

mount: fix breakage from recent changes (spurious -ro mounts)

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-24 01:01:01 +00:00
parent 29d94b907f
commit da3cec9c85
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
util-linux/mount.c
View File

@ -9,10 +9,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
/* todo:
* bb_getopt_ulflags();
*/
/* Design notes: There is no spec for mount. Remind me to write one. /* Design notes: There is no spec for mount. Remind me to write one.
mount_main() calls singlemount() which calls mount_it_now(). mount_main() calls singlemount() which calls mount_it_now().
@ -1427,7 +1423,7 @@ report_error:
int mount_main(int argc, char **argv) int mount_main(int argc, char **argv)
{ {
enum { OPT_ALL = 0x8 }; enum { OPT_ALL = 0x10 };
char *cmdopts = xstrdup(""), *fstype=0, *storage_path=0; char *cmdopts = xstrdup(""), *fstype=0, *storage_path=0;
char *opt_o; char *opt_o;
@ -1445,24 +1441,20 @@ int mount_main(int argc, char **argv)
append_mount_options(&cmdopts,argv[i]+2); append_mount_options(&cmdopts,argv[i]+2);
} else argv[j++] = argv[i]; } else argv[j++] = argv[i];
} }
argv[j] = 0;
argc = j; argc = j;
// Parse remaining options // Parse remaining options
opt = bb_getopt_ulflags(argc, argv, "o:t:rwavnf", &opt_o, &fstype); opt = bb_getopt_ulflags(argc, argv, "o:t:rwanfv", &opt_o, &fstype);
if (opt & 1) // -o if (opt & 0x1) append_mount_options(&cmdopts, opt_o); // -o
append_mount_options(&cmdopts, opt_o); //if (opt & 0x2) // -t
//if (opt & 1) // -t if (opt & 0x4) append_mount_options(&cmdopts, "ro"); // -r
if (opt & 2) // -r if (opt & 0x8) append_mount_options(&cmdopts, "rw"); // -w
append_mount_options(&cmdopts, "ro"); //if (opt & 0x10) // -a
if (opt & 4) // -w if (opt & 0x20) USE_FEATURE_MTAB_SUPPORT(useMtab = FALSE); // -n
append_mount_options(&cmdopts, "rw"); if (opt & 0x40) USE_FEATURE_MTAB_SUPPORT(fakeIt = FALSE); // -f
//if (opt & 8) // -a //if (opt & 0x80) // -v: ignore
if (opt & 0x10) // -n
USE_FEATURE_MTAB_SUPPORT(useMtab = FALSE);
if (opt & 0x20) // -f
USE_FEATURE_MTAB_SUPPORT(fakeIt = FALSE);
//if (opt & 0x40) // ignore -v
argv += optind; argv += optind;
argc -= optind; argc -= optind;