diff options
| author | Dan McGee <dan@archlinux.org> | 2011-02-11 10:34:34 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-02-11 10:34:37 -0600 |
| commit | 0eac60cd9d478774025a10decce835dea42f9ce4 (patch) | |
| tree | e2cac2e5c675d2ac02157f9db0fce4ff51c8f667 | |
| parent | 06cbb516c35eb81220064878ff202c3107b12c99 (diff) | |
| download | pacman-0eac60cd9d478774025a10decce835dea42f9ce4.tar.gz pacman-0eac60cd9d478774025a10decce835dea42f9ce4.zip | |
Fix mount dir length calculation
In the getmntinfo() section, the local variable mnt doesn't exist; this
would have caused a compile error if I had tested the code on such a
platform. Unify both codepaths to just run strlen() on the already copied
mount path instead.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/diskspace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index ae2edf7d..420a2496 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -83,7 +83,7 @@ static alpm_list_t *mount_point_list(void) MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); - mp->mount_dir_len = strlen(mnt->mnt_dir); + mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), &fsp, sizeof(FSSTATSTYPE)); mp->blocks_needed = 0l; @@ -101,13 +101,13 @@ static alpm_list_t *mount_point_list(void) entries = getmntinfo(&fsp, MNT_NOWAIT); if (entries < 0) { - return NULL; + return(NULL); } for(; entries-- > 0; fsp++) { MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(fsp->f_mntonname); - mp->mount_dir_len = strlen(mnt->mnt_dir); + mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE)); mp->blocks_needed = 0l; |