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

Almost ported volume information reporting to NetBSD

Browse Source
This commit is contained in:
Pierre Pronchery 2006-01-23 17:19:14 +00:00
parent 97e20a88ff
commit 2326ce9466
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/probe.c
View File

@ -7,16 +7,17 @@
#include <System.h> #include <System.h>
#include <utmpx.h> #include <utmpx.h>
#include <sys/statvfs.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef _GNU_SOURCE #ifdef _GNU_SOURCE
# include <sys/sysinfo.h> # include <sys/sysinfo.h>
# include <sys/statvfs.h>
#else #else
# include <sys/param.h> # include <sys/param.h>
# include <sys/sysctl.h> # include <sys/sysctl.h>
# include <sys/resource.h> # include <sys/resource.h>
# include <sys/mount.h>
#endif #endif
#define PROBE_REFRESH 10 #define PROBE_REFRESH 10
@ -236,8 +237,13 @@ struct volinfo
{ {
char name[256]; char name[256];
unsigned long block_size; unsigned long block_size;
#ifdef _GNU_SOURCE
fsblkcnt_t total; fsblkcnt_t total;
fsblkcnt_t free; fsblkcnt_t free;
#else
long total;
long free;
#endif
}; };
static int _probe_error(char * message, int ret); /* FIXME re-place */ static int _probe_error(char * message, int ret); /* FIXME re-place */
@ -276,7 +282,11 @@ static int _volinfo_append(struct volinfo ** dev, char * buf, int nb)
unsigned int i; unsigned int i;
unsigned int j; unsigned int j;
struct volinfo * p; struct volinfo * p;
#ifdef _GNU_SOURCE
struct statvfs sv; struct statvfs sv;
#else
struct statfs sf;
#endif
for(i = 0; buf[i] != '\0' && buf[i] != ' '; i++); for(i = 0; buf[i] != '\0' && buf[i] != ' '; i++);
if(buf[i] == '\0') if(buf[i] == '\0')
@ -295,11 +305,19 @@ static int _volinfo_append(struct volinfo ** dev, char * buf, int nb)
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "_volinfo_append: %s\n", p[nb].name); fprintf(stderr, "_volinfo_append: %s\n", p[nb].name);
#endif #endif
#ifdef _GNU_SOURCE
if(statvfs(p[nb].name, &sv) != 0) if(statvfs(p[nb].name, &sv) != 0)
return 1; return 1;
p[nb].block_size = sv.f_bsize; p[nb].block_size = sv.f_bsize;
p[nb].total = sv.f_blocks; p[nb].total = sv.f_blocks;
p[nb].free = sv.f_bavail; p[nb].free = sv.f_bavail;
#else
if(statfs(p[nb].name, &sf) != 0)
return 1;
p[nb].block_size = sf.f_bsize;
p[nb].total = sf.f_blocks;
p[nb].free = sf.f_bfree;
#endif
return 0; return 0;
} }
@ -388,7 +406,7 @@ static int _probe_timeout(Probe * probe)
return _probe_error("ifinfo", 1); return _probe_error("ifinfo", 1);
probe->ifinfo_cnt = i; probe->ifinfo_cnt = i;
if((i = _volinfo(&probe->volinfo)) < 0) if((i = _volinfo(&probe->volinfo)) < 0)
return 1; return 0;
probe->volinfo_cnt = i; probe->volinfo_cnt = i;
return 0; return 0;
} }