Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repport sizes in KB as the R5 version. Added --human (-h) to make reading sizes easier.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4995 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2003-10-12 00:47:52 +00:00
parent f981a55840
commit 8881c2584e
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/apps/bin/df.cpp
View File

@ -20,11 +20,12 @@ void PrintUsageInfo (void);
void PrintFlagSupport (uint32 dev_flags, uint32 test_flag, char * flag_descr, bool verbose); void PrintFlagSupport (uint32 dev_flags, uint32 test_flag, char * flag_descr, bool verbose);
void PrintMountPoint (dev_t dev_num, bool verbose); void PrintMountPoint (dev_t dev_num, bool verbose);
void PrintType (const char * fsh_name); void PrintType (const char * fsh_name);
void PrintBlocks (int64 blocks); void PrintBlocks (int64 blocks, int64 blocksize, bool human);
int main (int32 argc, char **argv) int main (int32 argc, char **argv)
{ {
bool verbose = false; bool verbose = false;
bool human = false;
if (argc > 1) if (argc > 1)
{ {
@ -41,6 +42,11 @@ int main (int32 argc, char **argv)
{ {
verbose = true; verbose = true;
} }
if (option == "--human" || option == "-h")
{
human = true;
}
} }
if (! verbose) if (! verbose)
@ -94,8 +100,8 @@ int main (int32 argc, char **argv)
{ {
PrintMountPoint (info.dev, verbose); PrintMountPoint (info.dev, verbose);
PrintType(info.fsh_name); PrintType(info.fsh_name);
PrintBlocks(info.total_blocks); PrintBlocks(info.total_blocks, info.block_size, human);
PrintBlocks(info.free_blocks); PrintBlocks(info.free_blocks, info.block_size, human);
PrintFlagSupport (info.flags, B_FS_HAS_QUERY, "Q", verbose); PrintFlagSupport (info.flags, B_FS_HAS_QUERY, "Q", verbose);
PrintFlagSupport (info.flags, B_FS_HAS_ATTR, "A", verbose); PrintFlagSupport (info.flags, B_FS_HAS_ATTR, "A", verbose);
@ -120,7 +126,8 @@ int main (int32 argc, char **argv)
void PrintUsageInfo (void) void PrintUsageInfo (void)
{ {
printf ("usage: df [--verbose | --help]\n" printf ("usage: df [--verbose | --help | --human | -h]\n"
" -h = --human = human readable (KB by default)\n"
" flags:\n" " flags:\n"
" Q: has query\n" " Q: has query\n"
" A: has attribute\n" " A: has attribute\n"
@ -187,10 +194,29 @@ void PrintType (const char * fsh_name)
printf("%s", type.String()); printf("%s", type.String());
} }
void PrintBlocks (int64 blocks) void PrintBlocks (int64 blocks, int64 blocksize, bool human)
{ {
char * temp = new char [1024]; char * temp = new char [1024];
sprintf(temp, "%Ld", blocks); if (!human)
sprintf(temp, "%lld", blocks * (blocksize / 1024));
else {
if (blocks < 1024) {
sprintf(temp, "%lld" /*" B"*/, blocks);
} else {
double fblocks = ((double)blocks) * (blocksize / 1024);
if (fblocks < 1024) {
sprintf(temp, "%.1LfK", fblocks);
} else {
fblocks = (((double)blocks) / 1024) * (blocksize / 1024);;
if (fblocks < 1024) {
sprintf(temp, "%.1LfM", fblocks);
} else {
fblocks = (((double)blocks) / (1024*1024)) * (blocksize / 1024);
sprintf(temp, "%.1LfG", fblocks);
}
}
}
}
BString type = " "; BString type = " ";
type.Insert(temp, 8 - strlen(temp)); type.Insert(temp, 8 - strlen(temp));