diff options
Diffstat (limited to 'mount.c')
| -rw-r--r-- | mount.c | 11 |
1 files changed, 4 insertions, 7 deletions
| @@ -395,18 +395,15 @@ extern int mount_main(int argc, char **argv) | |||
| 395 | if (optind < argc) { | 395 | if (optind < argc) { |
| 396 | /* if device is a filename get its real path */ | 396 | /* if device is a filename get its real path */ |
| 397 | if (stat(argv[optind], &statbuf) == 0) { | 397 | if (stat(argv[optind], &statbuf) == 0) { |
| 398 | realpath(argv[optind], device); | 398 | device = simplify_path(argv[optind]); |
| 399 | } else { | 399 | } else { |
| 400 | safe_strncpy(device, argv[optind], PATH_MAX); | 400 | safe_strncpy(device, argv[optind], PATH_MAX); |
| 401 | } | 401 | } |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | if (optind + 1 < argc) { | 404 | if (optind + 1 < argc) |
| 405 | if (realpath(argv[optind + 1], directory) == NULL) { | 405 | directory = simplify_path(argv[optind + 1]); |
| 406 | perror_msg_and_die("%s", directory); | 406 | |
| 407 | } | ||
| 408 | } | ||
| 409 | |||
| 410 | if (all == TRUE || optind + 1 == argc) { | 407 | if (all == TRUE || optind + 1 == argc) { |
| 411 | struct mntent *m = NULL; | 408 | struct mntent *m = NULL; |
| 412 | FILE *f = setmntent("/etc/fstab", "r"); | 409 | FILE *f = setmntent("/etc/fstab", "r"); |