diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-10-18 19:15:57 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-10-18 19:15:57 +0000 |
| commit | f9dde919d6ff592777c6b268d9c96d4214a9e711 (patch) | |
| tree | 301bcad8c22780a074173eb067b6544f4cde50a0 /util-linux/mount.c | |
| parent | 1dfeeeb65137fe9af27faaf844ba98e1b3bc9c12 (diff) | |
| download | busybox-w32-f9dde919d6ff592777c6b268d9c96d4214a9e711.tar.gz busybox-w32-f9dde919d6ff592777c6b268d9c96d4214a9e711.tar.bz2 busybox-w32-f9dde919d6ff592777c6b268d9c96d4214a9e711.zip | |
mount: -o parm1 -o parm2 should accumulate
Diffstat (limited to 'util-linux/mount.c')
| -rw-r--r-- | util-linux/mount.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 4cc1d4bee..313521aa0 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
| @@ -1754,7 +1754,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv) | |||
| 1754 | char *cmdopts = xstrdup(""); | 1754 | char *cmdopts = xstrdup(""); |
| 1755 | char *fstype = NULL; | 1755 | char *fstype = NULL; |
| 1756 | char *storage_path; | 1756 | char *storage_path; |
| 1757 | char *opt_o; | 1757 | llist_t *lst_o = NULL; |
| 1758 | const char *fstabname; | 1758 | const char *fstabname; |
| 1759 | FILE *fstab; | 1759 | FILE *fstab; |
| 1760 | int i, j, rc = 0; | 1760 | int i, j, rc = 0; |
| @@ -1776,10 +1776,10 @@ int mount_main(int argc UNUSED_PARAM, char **argv) | |||
| 1776 | 1776 | ||
| 1777 | // Parse remaining options | 1777 | // Parse remaining options |
| 1778 | // Max 2 params; -v is a counter | 1778 | // Max 2 params; -v is a counter |
| 1779 | opt_complementary = "?2" USE_FEATURE_MOUNT_VERBOSE(":vv"); | 1779 | opt_complementary = "?2o::" USE_FEATURE_MOUNT_VERBOSE(":vv"); |
| 1780 | opt = getopt32(argv, OPTION_STR, &opt_o, &fstype | 1780 | opt = getopt32(argv, OPTION_STR, &lst_o, &fstype |
| 1781 | USE_FEATURE_MOUNT_VERBOSE(, &verbose)); | 1781 | USE_FEATURE_MOUNT_VERBOSE(, &verbose)); |
| 1782 | if (opt & OPT_o) append_mount_options(&cmdopts, opt_o); // -o | 1782 | while (lst_o) append_mount_options(&cmdopts, llist_pop(&lst_o)); // -o |
| 1783 | if (opt & OPT_r) append_mount_options(&cmdopts, "ro"); // -r | 1783 | if (opt & OPT_r) append_mount_options(&cmdopts, "ro"); // -r |
| 1784 | if (opt & OPT_w) append_mount_options(&cmdopts, "rw"); // -w | 1784 | if (opt & OPT_w) append_mount_options(&cmdopts, "rw"); // -w |
| 1785 | argv += optind; | 1785 | argv += optind; |