You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
1.9 KiB

  1. --- a/src/mount_davfs.c
  2. +++ b/src/mount_davfs.c
  3. @@ -702,7 +702,7 @@ check_fstab(const dav_args *args)
  4. struct mntent *ft = getmntent(fstab);
  5. while (ft) {
  6. if (ft->mnt_dir) {
  7. - char *mp = canonicalize_file_name(ft->mnt_dir);
  8. + char *mp = realpath(ft->mnt_dir, NULL);
  9. if (mp) {
  10. if (strcmp(mp, mpoint) == 0) {
  11. free(mp);
  12. @@ -966,7 +966,7 @@ parse_commandline(int argc, char *argv[])
  13. url = ne_strdup(argv[i]);
  14. }
  15. i++;
  16. - mpoint = canonicalize_file_name(argv[i]);
  17. + mpoint = realpath(argv[i], NULL);
  18. if (!mpoint)
  19. error(EXIT_FAILURE, 0,
  20. _("can't evaluate path of mount point %s"), mpoint);
  21. @@ -2188,7 +2188,7 @@ read_config(dav_args *args, const char * filename, int system)
  22. error_at_line(EXIT_FAILURE, 0, filename, lineno,
  23. _("malformed line"));
  24. *(parmv[0] + strlen(parmv[0]) - 1) = '\0';
  25. - char *mp = canonicalize_file_name(parmv[0] + 1);
  26. + char *mp = realpath(parmv[0] + 1, NULL);
  27. if (mp) {
  28. applies = (strcmp(mp, mpoint) == 0);
  29. free(mp);
  30. @@ -2440,7 +2440,7 @@ read_secrets(dav_args *args, const char *filename)
  31. if (scheme && !port)
  32. port = ne_uri_defaultport(scheme);
  33. - char *mp = canonicalize_file_name(parmv[0]);
  34. + char *mp = realpath(parmv[0], NULL);
  35. char *ccert = NULL;
  36. if (args->clicert) {
  37. --- a/src/umount_davfs.c
  38. +++ b/src/umount_davfs.c
  39. @@ -118,7 +118,7 @@ main(int argc, char *argv[])
  40. if (optind < (argc - 1))
  41. error(EXIT_FAILURE, 0, _("too many arguments"));
  42. - char *mpoint = canonicalize_file_name(argv[optind]);
  43. + char *mpoint = realpath(argv[optind], NULL);
  44. char *umount_command = NULL;
  45. if (mpoint) {