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

Volume information considers the block size in multiples of kilobytes

Browse Source
This commit is contained in:
Pierre Pronchery 2006-01-23 14:45:37 +00:00
parent f292ba2346
commit 39f813ef11
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/probe.c
View File

@ -272,8 +272,8 @@ static int _volinfo(struct volinfo ** dev)
static int _volinfo_append(struct volinfo ** dev, char * buf, int nb)
{
int i;
int j;
unsigned int i;
unsigned int j;
struct volinfo * p;
struct statvfs sv;
@ -287,7 +287,9 @@ static int _volinfo_append(struct volinfo ** dev, char * buf, int nb)
return 1;
*dev = p;
memset(&p[nb], 0, sizeof(struct volinfo));
strncpy(p[nb].name, &buf[i], j-i); /* FIXME overflow possible */
if(j-i >= sizeof(p[nb].name)-1)
return 1;
strncpy(p[nb].name, &buf[i], j-i);
p[nb].name[j-i] = '\0';
#ifdef DEBUG
fprintf(stderr, "_volinfo_append: %s\n", p[nb].name);
@ -530,10 +532,9 @@ int voltotal(char * vol)
printf("%s%s%s%u%s", "Volume ", probe.volinfo[i].name, " total: ",
probe.volinfo[i].total, "\n");
#endif
return probe.volinfo[i].total;
return probe.volinfo[i].total * (probe.volinfo[i].block_size / 1024);
}
int volfree(char * vol)
{
unsigned int i;
@ -547,7 +548,7 @@ int volfree(char * vol)
printf("%s%s%s%u%s", "Volume ", probe.volinfo[i].name, " free: ",
probe.volinfo[i].free, "\n");
#endif
return probe.volinfo[i].free;
return probe.volinfo[i].free * (probe.volinfo[i].block_size / 1024);
}