DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Added support for FreeBSD (compile-tested only)

Browse Source
This commit is contained in:
Pierre Pronchery 2013-11-27 22:31:38 +01:00
parent 7de72d577f
commit 385520fc11
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/volumes.c
View File

@ -18,7 +18,11 @@
#include <System.h> #include <System.h>
#include <string.h> #include <string.h>
#include <libintl.h> #include <libintl.h>
#ifdef __NetBSD__ #if defined(__FreeBSD__)
# include <sys/param.h>
# include <sys/ucred.h>
# include <sys/mount.h>
#elif defined(__NetBSD__)
# include <sys/types.h> # include <sys/types.h>
# include <sys/statvfs.h> # include <sys/statvfs.h>
#endif #endif
@ -170,10 +174,14 @@ static void _refresh_add(Volumes * volumes, char const * name,
static void _volumes_refresh(Volumes * volumes, GList * selection) static void _volumes_refresh(Volumes * volumes, GList * selection)
{ {
char * path = (selection != NULL) ? selection->data : NULL; char * path = (selection != NULL) ? selection->data : NULL;
#ifdef __NetBSD__ #if defined(ST_NOWAIT)
struct statvfs * mnt; struct statvfs * mnt;
int res; int res;
int i; int i;
#elif defined(MNT_NOWAIT)
struct statfs * mnt;
int res;
int i;
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -188,8 +196,15 @@ static void _volumes_refresh(Volumes * volumes, GList * selection)
} }
/* FIXME no longer clear the list every time */ /* FIXME no longer clear the list every time */
gtk_list_store_clear(volumes->store); gtk_list_store_clear(volumes->store);
#ifdef __NetBSD__ #if defined(ST_NOWAIT)
if((res = getmntinfo(&mnt, ST_WAIT)) <= 0) if((res = getmntinfo(&mnt, ST_NOWAIT)) <= 0)
return;
for(i = 0; i < res; i++)
_refresh_add(volumes, NULL, mnt[i].f_mntfromname,
mnt[i].f_mntonname, mnt[i].f_fstypename,
mnt[i].f_bavail, mnt[i].f_blocks);
#elif defined(MNT_NOWAIT)
if((res = getmntinfo(&mnt, MNT_NOWAIT)) <= 0)
return; return;
for(i = 0; i < res; i++) for(i = 0; i < res; i++)
_refresh_add(volumes, NULL, mnt[i].f_mntfromname, _refresh_add(volumes, NULL, mnt[i].f_mntfromname,