moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

diskspace: dedupe code for loading FS usage

Browse Source 
add mount_point_load_fsinfo() for platforms using getmntent().

Dan: move the #ifdef slightly so we don't have unused functions on
certain platforms (e.g., OS X).

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2012-04-29 14:54:10 -04:00 committed by Dan McGee
parent 377cc23a09
commit 82c999a8bf
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/libalpm/diskspace.c
View File

@ -69,6 +69,23 @@ static void mount_point_list_free(alpm_list_t *mount_points)
FREELIST(mount_points); FREELIST(mount_points);
} }
#if defined(HAVE_GETMNTENT)
static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint)
{
/* grab the filesystem usage */
if(statvfs(mountpoint->mount_dir, &(mountpoint->fsp)) != 0) {
_alpm_log(handle, ALPM_LOG_WARNING,
_("could not get filesystem information for %s: %s\n"),
mountpoint->mount_dir, strerror(errno));
return -1;
}
mountpoint->read_only = mountpoint->fsp.f_flag & ST_RDONLY;
return 0;
}
#endif
static alpm_list_t *mount_point_list(alpm_handle_t *handle) static alpm_list_t *mount_point_list(alpm_handle_t *handle)
{ {
alpm_list_t *mount_points = NULL, *ptr; alpm_list_t *mount_points = NULL, *ptr;
@ -86,24 +103,14 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle)
} }
while((mnt = getmntent(fp))) { while((mnt = getmntent(fp))) {
struct statvfs fsp;
if(!mnt) {
_alpm_log(handle, ALPM_LOG_WARNING,
_("could not get filesystem information\n"));
continue;
}
if(statvfs(mnt->mnt_dir, &fsp) != 0) {
_alpm_log(handle, ALPM_LOG_WARNING,
_("could not get filesystem information for %s: %s\n"),
mnt->mnt_dir, strerror(errno));
continue;
}
CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
mp->mount_dir = strdup(mnt->mnt_dir); mp->mount_dir = strdup(mnt->mnt_dir);
mp->mount_dir_len = strlen(mp->mount_dir); mp->mount_dir_len = strlen(mp->mount_dir);
memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); if(mount_point_load_fsinfo(handle, mp) < 0) {
mp->read_only = fsp.f_flag & ST_RDONLY; free(mp->mount_dir);
free(mp);
continue;
}
mount_points = alpm_list_add(mount_points, mp); mount_points = alpm_list_add(mount_points, mp);
} }
@ -122,19 +129,14 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle)
} }
while((ret = getmntent(fp, &mnt)) == 0) { while((ret = getmntent(fp, &mnt)) == 0) {
struct statvfs fsp;
if(statvfs(mnt->mnt_mountp, &fsp) != 0) {
_alpm_log(handle, ALPM_LOG_WARNING,
_("could not get filesystem information for %s: %s\n"),
mnt->mnt_mountp, strerror(errno));
continue;
}
CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
mp->mount_dir = strdup(mnt->mnt_mountp); mp->mount_dir = strdup(mnt->mnt_mountp);
mp->mount_dir_len = strlen(mp->mount_dir); mp->mount_dir_len = strlen(mp->mount_dir);
memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); if(mount_point_load_fsinfo(handle, mp) < 0) {
mp->read_only = fsp.f_flag & ST_RDONLY; free(mp->mount_dir);
free(mp);
continue;
}
mount_points = alpm_list_add(mount_points, mp); mount_points = alpm_list_add(mount_points, mp);
} }