Commit Vladimir's simplify_path.

This commit is contained in:
Matt Kraai
2001-08-10 15:05:27 +00:00
parent 4fb0b51703
commit a7cecbc917
6 changed files with 90 additions and 15 deletions

View File

@ -395,18 +395,15 @@ extern int mount_main(int argc, char **argv)
if (optind < argc) {
/* if device is a filename get its real path */
if (stat(argv[optind], &statbuf) == 0) {
realpath(argv[optind], device);
device = simplify_path(argv[optind]);
} else {
safe_strncpy(device, argv[optind], PATH_MAX);
}
}
if (optind + 1 < argc) {
if (realpath(argv[optind + 1], directory) == NULL) {
perror_msg_and_die("%s", directory);
}
}
if (optind + 1 < argc)
directory = simplify_path(argv[optind + 1]);
if (all == TRUE || optind + 1 == argc) {
struct mntent *m = NULL;
FILE *f = setmntent("/etc/fstab", "r");