From 9ce4f80db4cccfe16c4a747b8bf3185b48e8aefc Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 29 Apr 2012 18:26:13 -0400 Subject: diskspace: canonicalize path to download dir With lazy loading in place, it's now quite obvious that we aren't necessarily checking the right mountpoint for necessary download space. Signed-off-by: Dave Reisner --- lib/libalpm/diskspace.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/libalpm') diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index daee2447..1fc297ed 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -325,9 +325,17 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir, { alpm_list_t *mount_points; alpm_mountpoint_t *cachedir_mp; + char resolved_cachedir[PATH_MAX]; size_t j; int error = 0; + /* resolve the cachedir path to ensure we check the right mountpoint. We + * handle failures silently, and continue to use the possibly unresolved + * path. */ + if(realpath(cachedir, resolved_cachedir) != NULL) { + cachedir = resolved_cachedir; + } + mount_points = mount_point_list(handle); if(mount_points == NULL) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not determine filesystem mount points\n")); -- cgit v1.2.3-70-g09d2