summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-04-30 00:26:13 +0200
committerDan McGee <dan@archlinux.org>2012-06-26 06:00:12 +0200
commit9ce4f80db4cccfe16c4a747b8bf3185b48e8aefc (patch)
tree71b2cc26e8b0e9486ad05b4745117a2a47aeeb89 /lib/libalpm
parentac990b96e7d305e0f20f00601f2172879faac9a1 (diff)
downloadpacman-9ce4f80db4cccfe16c4a747b8bf3185b48e8aefc.tar.gz
pacman-9ce4f80db4cccfe16c4a747b8bf3185b48e8aefc.tar.xz
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 <dreisner@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/diskspace.c8
1 files changed, 8 insertions, 0 deletions
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"));