diff options
author | Matt Kraai <kraai@debian.org> | 2001-04-17 04:26:05 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2001-04-17 04:26:05 +0000 |
commit | 24ed3bee0c4ca631855a0f43f75e30ba0c134b9f (patch) | |
tree | 46b93cb7ab0d0a68ae27d1c2f7d12571001e5ce8 | |
parent | 3d406da0c90e319d0e05f75e2dcd485d5954fc1d (diff) | |
download | busybox-w32-24ed3bee0c4ca631855a0f43f75e30ba0c134b9f.tar.gz busybox-w32-24ed3bee0c4ca631855a0f43f75e30ba0c134b9f.tar.bz2 busybox-w32-24ed3bee0c4ca631855a0f43f75e30ba0c134b9f.zip |
Fix -a support (broken by previous patch).
-rw-r--r-- | mount.c | 6 | ||||
-rw-r--r-- | util-linux/mount.c | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -405,14 +405,14 @@ extern int mount_main(int argc, char **argv) | |||
405 | argv++; | 405 | argv++; |
406 | } | 406 | } |
407 | 407 | ||
408 | if (device == NULL && directory == NULL) | ||
409 | goto goodbye; | ||
410 | |||
411 | if (all == TRUE || directory == NULL) { | 408 | if (all == TRUE || directory == NULL) { |
412 | struct mntent *m; | 409 | struct mntent *m; |
413 | FILE *f = setmntent("/etc/fstab", "r"); | 410 | FILE *f = setmntent("/etc/fstab", "r"); |
414 | fstabmount = TRUE; | 411 | fstabmount = TRUE; |
415 | 412 | ||
413 | if (all == FALSE && device == NULL) | ||
414 | goto goodbye; | ||
415 | |||
416 | if (f == NULL) | 416 | if (f == NULL) |
417 | perror_msg_and_die( "\nCannot read /etc/fstab"); | 417 | perror_msg_and_die( "\nCannot read /etc/fstab"); |
418 | 418 | ||
diff --git a/util-linux/mount.c b/util-linux/mount.c index d1568d803..311d518aa 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -405,14 +405,14 @@ extern int mount_main(int argc, char **argv) | |||
405 | argv++; | 405 | argv++; |
406 | } | 406 | } |
407 | 407 | ||
408 | if (device == NULL && directory == NULL) | ||
409 | goto goodbye; | ||
410 | |||
411 | if (all == TRUE || directory == NULL) { | 408 | if (all == TRUE || directory == NULL) { |
412 | struct mntent *m; | 409 | struct mntent *m; |
413 | FILE *f = setmntent("/etc/fstab", "r"); | 410 | FILE *f = setmntent("/etc/fstab", "r"); |
414 | fstabmount = TRUE; | 411 | fstabmount = TRUE; |
415 | 412 | ||
413 | if (all == FALSE && device == NULL) | ||
414 | goto goodbye; | ||
415 | |||
416 | if (f == NULL) | 416 | if (f == NULL) |
417 | perror_msg_and_die( "\nCannot read /etc/fstab"); | 417 | perror_msg_and_die( "\nCannot read /etc/fstab"); |
418 | 418 | ||