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

Fix bug #1108 by always canonicalizing arguments.

Browse Source
This commit is contained in:
Matt Kraai 2001-05-02 21:17:38 +00:00
parent 0fcd447d59
commit 3425111bb9
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mount.c
View File

@ -43,6 +43,7 @@
* *
*/ */
#include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
@ -338,8 +339,7 @@ extern int mount_main(int argc, char **argv)
char *extra_opts = string_flags_buf; char *extra_opts = string_flags_buf;
int flags = 0; int flags = 0;
char *filesystemType = "auto"; char *filesystemType = "auto";
char *device = NULL; char device[PATH_MAX], directory[PATH_MAX];
char *directory = NULL;
int all = FALSE; int all = FALSE;
int fakeIt = FALSE; int fakeIt = FALSE;
int useMtab = TRUE; int useMtab = TRUE;
@ -378,15 +378,18 @@ extern int mount_main(int argc, char **argv)
} }
} }
if (argv[optind] != NULL) { if (!all && optind == argc)
device = argv[optind];
directory = argv[optind + 1];
}
if (device == NULL && !all)
show_mounts(); show_mounts();
if (all == TRUE || directory == NULL) { if (optind < argc)
if (realpath(argv[optind], device) == NULL)
perror_msg_and_die("%s", device);
if (optind + 1 < argc)
if (realpath(argv[optind + 1], directory) == NULL)
perror_msg_and_die("%s", directory);
if (all == TRUE || optind + 1 == argc) {
struct mntent *m; struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r"); FILE *f = setmntent("/etc/fstab", "r");
fstabmount = TRUE; fstabmount = TRUE;
@ -395,7 +398,7 @@ extern int mount_main(int argc, char **argv)
perror_msg_and_die( "\nCannot read /etc/fstab"); perror_msg_and_die( "\nCannot read /etc/fstab");
while ((m = getmntent(f)) != NULL) { while ((m = getmntent(f)) != NULL) {
if (all == FALSE && directory == NULL && ( if (all == FALSE && optind + 1 == argc && (
(strcmp(device, m->mnt_fsname) != 0) && (strcmp(device, m->mnt_fsname) != 0) &&
(strcmp(device, m->mnt_dir) != 0) ) ) { (strcmp(device, m->mnt_dir) != 0) ) ) {
continue; continue;
@ -414,8 +417,8 @@ extern int mount_main(int argc, char **argv)
parse_mount_options(m->mnt_opts, &flags, string_flags); parse_mount_options(m->mnt_opts, &flags, string_flags);
} }
device = strdup(m->mnt_fsname); strcpy(device, m->mnt_fsname);
directory = strdup(m->mnt_dir); strcpy(directory, m->mnt_dir);
filesystemType = strdup(m->mnt_type); filesystemType = strdup(m->mnt_type);
singlemount: singlemount:
string_flags = strdup(string_flags); string_flags = strdup(string_flags);
@ -441,7 +444,7 @@ singlemount:
if (fstabmount == TRUE) if (fstabmount == TRUE)
endmntent(f); endmntent(f);
if (all == FALSE && fstabmount == TRUE && directory == NULL) if (all == FALSE && fstabmount == TRUE && optind + 1 == argc)
fprintf(stderr, "Can't find %s in /etc/fstab\n", device); fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
return rc; return rc;

29
util-linux/mount.c
View File

@ -43,6 +43,7 @@
* *
*/ */
#include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
@ -338,8 +339,7 @@ extern int mount_main(int argc, char **argv)
char *extra_opts = string_flags_buf; char *extra_opts = string_flags_buf;
int flags = 0; int flags = 0;
char *filesystemType = "auto"; char *filesystemType = "auto";
char *device = NULL; char device[PATH_MAX], directory[PATH_MAX];
char *directory = NULL;
int all = FALSE; int all = FALSE;
int fakeIt = FALSE; int fakeIt = FALSE;
int useMtab = TRUE; int useMtab = TRUE;
@ -378,15 +378,18 @@ extern int mount_main(int argc, char **argv)
} }
} }
if (argv[optind] != NULL) { if (!all && optind == argc)
device = argv[optind];
directory = argv[optind + 1];
}
if (device == NULL && !all)
show_mounts(); show_mounts();
if (all == TRUE || directory == NULL) { if (optind < argc)
if (realpath(argv[optind], device) == NULL)
perror_msg_and_die("%s", device);
if (optind + 1 < argc)
if (realpath(argv[optind + 1], directory) == NULL)
perror_msg_and_die("%s", directory);
if (all == TRUE || optind + 1 == argc) {
struct mntent *m; struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r"); FILE *f = setmntent("/etc/fstab", "r");
fstabmount = TRUE; fstabmount = TRUE;
@ -395,7 +398,7 @@ extern int mount_main(int argc, char **argv)
perror_msg_and_die( "\nCannot read /etc/fstab"); perror_msg_and_die( "\nCannot read /etc/fstab");
while ((m = getmntent(f)) != NULL) { while ((m = getmntent(f)) != NULL) {
if (all == FALSE && directory == NULL && ( if (all == FALSE && optind + 1 == argc && (
(strcmp(device, m->mnt_fsname) != 0) && (strcmp(device, m->mnt_fsname) != 0) &&
(strcmp(device, m->mnt_dir) != 0) ) ) { (strcmp(device, m->mnt_dir) != 0) ) ) {
continue; continue;
@ -414,8 +417,8 @@ extern int mount_main(int argc, char **argv)
parse_mount_options(m->mnt_opts, &flags, string_flags); parse_mount_options(m->mnt_opts, &flags, string_flags);
} }
device = strdup(m->mnt_fsname); strcpy(device, m->mnt_fsname);
directory = strdup(m->mnt_dir); strcpy(directory, m->mnt_dir);
filesystemType = strdup(m->mnt_type); filesystemType = strdup(m->mnt_type);
singlemount: singlemount:
string_flags = strdup(string_flags); string_flags = strdup(string_flags);
@ -441,7 +444,7 @@ singlemount:
if (fstabmount == TRUE) if (fstabmount == TRUE)
endmntent(f); endmntent(f);
if (all == FALSE && fstabmount == TRUE && directory == NULL) if (all == FALSE && fstabmount == TRUE && optind + 1 == argc)
fprintf(stderr, "Can't find %s in /etc/fstab\n", device); fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
return rc; return rc;