summaryrefslogtreecommitdiff
path: root/util-linux/mount.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-09-17 15:04:35 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-09-17 15:04:35 +0000
commit13b4924ce0ab3f78d2105b9f55b73a4f66c7028b (patch)
tree138c2f906c2a17aac3b9b8ac689d235f264b8613 /util-linux/mount.c
parent3bc59aa2a46c132121d892254c81ad7e54eb796d (diff)
downloadbusybox-w32-13b4924ce0ab3f78d2105b9f55b73a4f66c7028b.tar.gz
busybox-w32-13b4924ce0ab3f78d2105b9f55b73a4f66c7028b.tar.bz2
busybox-w32-13b4924ce0ab3f78d2105b9f55b73a4f66c7028b.zip
mount: style fixes
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r--util-linux/mount.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index ed81ba4b2..f4dcbad0b 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1340,14 +1340,14 @@ static int singlemount(struct mntent *mp, int ignore_busy)
1340 loopFile = bb_simplify_path(mp->mnt_fsname); 1340 loopFile = bb_simplify_path(mp->mnt_fsname);
1341 mp->mnt_fsname = 0; 1341 mp->mnt_fsname = 0;
1342 switch (set_loop(&(mp->mnt_fsname), loopFile, 0)) { 1342 switch (set_loop(&(mp->mnt_fsname), loopFile, 0)) {
1343 case 0: 1343 case 0:
1344 case 1: 1344 case 1:
1345 break; 1345 break;
1346 default: 1346 default:
1347 bb_error_msg( errno == EPERM || errno == EACCES 1347 bb_error_msg( errno == EPERM || errno == EACCES
1348 ? bb_msg_perm_denied_are_you_root 1348 ? bb_msg_perm_denied_are_you_root
1349 : "cannot setup loop device"); 1349 : "cannot setup loop device");
1350 return errno; 1350 return errno;
1351 } 1351 }
1352 1352
1353 // Autodetect bind mounts 1353 // Autodetect bind mounts
@@ -1379,7 +1379,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
1379 for (fl = fslist; fl; fl = fl->link) { 1379 for (fl = fslist; fl; fl = fl->link) {
1380 mp->mnt_type = fl->data; 1380 mp->mnt_type = fl->data;
1381 1381
1382 rc = mount_it_now(mp,vfsflags, filteropts); 1382 rc = mount_it_now(mp, vfsflags, filteropts);
1383 if (!rc) break; 1383 if (!rc) break;
1384 1384
1385 mp->mnt_type = 0; 1385 mp->mnt_type = 0;
@@ -1431,31 +1431,31 @@ int mount_main(int argc, char **argv)
1431 1431
1432 while ((opt = getopt(argc, argv, "o:t:rwavnf")) > 0) { 1432 while ((opt = getopt(argc, argv, "o:t:rwavnf")) > 0) {
1433 switch (opt) { 1433 switch (opt) {
1434 case 'o': 1434 case 'o':
1435 append_mount_options(&cmdopts, optarg); 1435 append_mount_options(&cmdopts, optarg);
1436 break; 1436 break;
1437 case 't': 1437 case 't':
1438 fstype = optarg; 1438 fstype = optarg;
1439 break; 1439 break;
1440 case 'r': 1440 case 'r':
1441 append_mount_options(&cmdopts, "ro"); 1441 append_mount_options(&cmdopts, "ro");
1442 break; 1442 break;
1443 case 'w': 1443 case 'w':
1444 append_mount_options(&cmdopts, "rw"); 1444 append_mount_options(&cmdopts, "rw");
1445 break; 1445 break;
1446 case 'a': 1446 case 'a':
1447 all = TRUE; 1447 all = TRUE;
1448 break; 1448 break;
1449 case 'n': 1449 case 'n':
1450 USE_FEATURE_MTAB_SUPPORT(useMtab = FALSE;) 1450 USE_FEATURE_MTAB_SUPPORT(useMtab = FALSE;)
1451 break; 1451 break;
1452 case 'f': 1452 case 'f':
1453 USE_FEATURE_MTAB_SUPPORT(fakeIt = FALSE;) 1453 USE_FEATURE_MTAB_SUPPORT(fakeIt = FALSE;)
1454 break; 1454 break;
1455 case 'v': 1455 case 'v':
1456 break; // ignore -v 1456 break; // ignore -v
1457 default: 1457 default:
1458 bb_show_usage(); 1458 bb_show_usage();
1459 } 1459 }
1460 } 1460 }
1461 argv += optind; 1461 argv += optind;