6543/davfs2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace canonicalize_file_name with realpath

Browse Source
This commit is contained in:
wbaumann 2020-08-21 09:10:49 +00:00
parent ef204e2c9e
commit 0c31986918
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,10 @@
ChangeLog for davfs2 ChangeLog for davfs2
-------------------- --------------------


2020-08-21 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.c, umount_davfs.c:
Replace canonicalize_file_name with realpath.

2020-08-13 Werner Baumann (werner.baumann@onlinehome.de) 2020-08-13 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.h, mount_davfs.c, webdav.h, webdav.c, * mount_davfs.h, mount_davfs.c, webdav.h, webdav.c,
cache.h, cache.c, etc/davfs2.conf, man/davfs2.conf.5, cache.h, cache.c, etc/davfs2.conf, man/davfs2.conf.5,

10
src/mount_davfs.c
View File

@ -710,7 +710,7 @@ check_fstab(const dav_args *args)
struct mntent *ft = getmntent(fstab); struct mntent *ft = getmntent(fstab);
while (ft) { while (ft) {
if (ft->mnt_dir) { if (ft->mnt_dir) {
char *mp = canonicalize_file_name(ft->mnt_dir); char *mp = realpath(ft->mnt_dir, NULL);
if (mp) { if (mp) {
if (strcmp(mp, mpoint) == 0) { if (strcmp(mp, mpoint) == 0) {
free(mp); free(mp);
@ -906,7 +906,7 @@ parse_commandline(dav_args *args, int argc, char *argv[])
url = ne_strdup(argv[i]); url = ne_strdup(argv[i]);
} }
i++; i++;
mpoint = canonicalize_file_name(argv[i]); mpoint = realpath(argv[i], NULL);
if (!mpoint) if (!mpoint)
error(EXIT_FAILURE, 0, error(EXIT_FAILURE, 0,
_("can't evaluate path of mount point %s"), mpoint); _("can't evaluate path of mount point %s"), mpoint);
@ -1044,7 +1044,7 @@ parse_persona(dav_args *args)
if (!pw || !pw->pw_name || !pw->pw_dir) if (!pw || !pw->pw_name || !pw->pw_dir)
error(EXIT_FAILURE, errno, _("can't read user data base")); error(EXIT_FAILURE, errno, _("can't read user data base"));
args->uid_name = ne_strdup(pw->pw_name); args->uid_name = ne_strdup(pw->pw_name);
args->home = canonicalize_file_name(pw->pw_dir); args->home = realpath(pw->pw_dir, NULL);
} }


args->ngroups = getgroups(0, NULL); args->ngroups = getgroups(0, NULL);
@ -2166,7 +2166,7 @@ read_config(dav_args *args, const char * filename, int system)
error_at_line(EXIT_FAILURE, 0, filename, lineno, error_at_line(EXIT_FAILURE, 0, filename, lineno,
_("malformed line")); _("malformed line"));
*(parmv[0] + strlen(parmv[0]) - 1) = '\0'; *(parmv[0] + strlen(parmv[0]) - 1) = '\0';
char *mp = canonicalize_file_name(parmv[0] + 1); char *mp = realpath(parmv[0] + 1, NULL);
if (mp) { if (mp) {
applies = (strcmp(mp, mpoint) == 0); applies = (strcmp(mp, mpoint) == 0);
free(mp); free(mp);
@ -2420,7 +2420,7 @@ read_secrets(dav_args *args, const char *filename, int system)
if (scheme && !port) if (scheme && !port)
port = ne_uri_defaultport(scheme); port = ne_uri_defaultport(scheme);


char *mp = canonicalize_file_name(parmv[0]); char *mp = realpath(parmv[0], NULL);


if ((mp && strcmp(mp, mpoint) == 0) if ((mp && strcmp(mp, mpoint) == 0)
|| (scheme && args->scheme || (scheme && args->scheme

5
src/umount_davfs.c
View File

@ -26,6 +26,9 @@
#ifdef HAVE_LIBINTL_H #ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#endif #endif
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#include <locale.h> #include <locale.h>
#endif #endif
@ -120,7 +123,7 @@ main(int argc, char *argv[])
if (optind < (argc - 1)) if (optind < (argc - 1))
error(EXIT_FAILURE, 0, _("too many arguments")); error(EXIT_FAILURE, 0, _("too many arguments"));


char *mpoint = canonicalize_file_name(argv[optind]); char *mpoint = realpath(argv[optind], NULL);


char *umount_command = NULL; char *umount_command = NULL;
if (mpoint) { if (mpoint) {