diff options
author | Rob Landley <rob@landley.net> | 2006-08-08 12:54:02 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-08-08 12:54:02 +0000 |
commit | 721b46e0e608d7ceccf422551d2f53f1c23c285c (patch) | |
tree | f24f1b67c3c090ff1b517e01af45e9affbc5b877 /util-linux/mount.c | |
parent | e3781b731215d826585fe37720eebe147705f340 (diff) | |
download | busybox-w32-721b46e0e608d7ceccf422551d2f53f1c23c285c.tar.gz busybox-w32-721b46e0e608d7ceccf422551d2f53f1c23c285c.tar.bz2 busybox-w32-721b46e0e608d7ceccf422551d2f53f1c23c285c.zip |
Fix a typo (|| instead of |) and remove two comments about a problem fixed
in the previous patch.
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r-- | util-linux/mount.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 5d5f487c2..5798a8bfa 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -233,7 +233,6 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts) | |||
233 | 233 | ||
234 | for(i=0; mount_options[i].flags != MS_REMOUNT; i++) | 234 | for(i=0; mount_options[i].flags != MS_REMOUNT; i++) |
235 | if (mount_options[i].flags > 0) | 235 | if (mount_options[i].flags > 0) |
236 | // Shut up about the darn const. It's not important. I don't care. (char *) | ||
237 | append_mount_options(&(mp->mnt_opts), mount_options[i].name); | 236 | append_mount_options(&(mp->mnt_opts), mount_options[i].name); |
238 | 237 | ||
239 | // Remove trailing / (if any) from directory we mounted on | 238 | // Remove trailing / (if any) from directory we mounted on |
@@ -292,7 +291,7 @@ static int singlemount(struct mntent *mp, int ignore_busy) | |||
292 | // Look at the file. (Not found isn't a failure for remount, or for | 291 | // Look at the file. (Not found isn't a failure for remount, or for |
293 | // a synthetic filesystem like proc or sysfs.) | 292 | // a synthetic filesystem like proc or sysfs.) |
294 | 293 | ||
295 | if (!lstat(mp->mnt_fsname, &st) && !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE | MS_SHARED | MS_PRIVATE || MS_SLAVE | MS_UNBINDABLE))) | 294 | if (!lstat(mp->mnt_fsname, &st) && !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE | MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))) |
296 | { | 295 | { |
297 | // Do we need to allocate a loopback device for it? | 296 | // Do we need to allocate a loopback device for it? |
298 | 297 | ||
@@ -463,7 +462,7 @@ int mount_main(int argc, char **argv) | |||
463 | // Open either fstab or mtab | 462 | // Open either fstab or mtab |
464 | 463 | ||
465 | if (parse_mount_options(cmdopts,0) & MS_REMOUNT) | 464 | if (parse_mount_options(cmdopts,0) & MS_REMOUNT) |
466 | fstabname = bb_path_mtab_file; // Again with the evil const (char *). | 465 | fstabname = bb_path_mtab_file; |
467 | else fstabname="/etc/fstab"; | 466 | else fstabname="/etc/fstab"; |
468 | 467 | ||
469 | if (!(fstab=setmntent(fstabname,"r"))) | 468 | if (!(fstab=setmntent(fstabname,"r"))) |