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

df: move mountpoint column last

Browse Source 
- Follow POSIX recommendations (even if other parts of the output don't match)
- If the mountpoint path is long, don't shift the other columns

Change-Id: I0ebfa2d6dca34792da8c3a26d996271298e0e65a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6380
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Adrien Destugues 2023-08-03 13:43:53 +02:00 committed by waddlesplash
parent abf8d2e209
commit 75d92dbdda
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/df.cpp
View File

@ -20,9 +20,9 @@
void void
PrintFlag(uint32 deviceFlags, uint32 testFlag, const char *yes, const char *no) PrintFlag(uint32 deviceFlags, uint32 testFlag, char yes, char no)
{ {
printf("%s", deviceFlags & testFlag ? yes : no); printf("%c", deviceFlags & testFlag ? yes : no);
} }
@ -117,13 +117,13 @@ PrintVerbose(dev_t device)
printf(" Device: %s\n", info.device_name); printf(" Device: %s\n", info.device_name);
printf(" Flags: "); printf(" Flags: ");
PrintFlag(info.flags, B_FS_HAS_QUERY, "Q", "-"); PrintFlag(info.flags, B_FS_HAS_QUERY, 'Q', '-');
PrintFlag(info.flags, B_FS_HAS_ATTR, "A", "-"); PrintFlag(info.flags, B_FS_HAS_ATTR, 'A', '-');
PrintFlag(info.flags, B_FS_HAS_MIME, "M", "-"); PrintFlag(info.flags, B_FS_HAS_MIME, 'M', '-');
PrintFlag(info.flags, B_FS_IS_SHARED, "S", "-"); PrintFlag(info.flags, B_FS_IS_SHARED, 'S', '-');
PrintFlag(info.flags, B_FS_IS_PERSISTENT, "P", "-"); PrintFlag(info.flags, B_FS_IS_PERSISTENT, 'P', '-');
PrintFlag(info.flags, B_FS_IS_REMOVABLE, "R", "-"); PrintFlag(info.flags, B_FS_IS_REMOVABLE, 'R', '-');
PrintFlag(info.flags, B_FS_IS_READONLY, "-", "W"); PrintFlag(info.flags, B_FS_IS_READONLY, '-', 'W');
printf("\n I/O Size: %10s (%" B_PRIdOFF " byte)\n", printf("\n I/O Size: %10s (%" B_PRIdOFF " byte)\n",
ByteString(info.io_size, 1), info.io_size); ByteString(info.io_size, 1), info.io_size);
@ -149,21 +149,22 @@ PrintCompact(dev_t device, bool showBlocks, bool all)
if (!all && (info.flags & B_FS_IS_PERSISTENT) == 0) if (!all && (info.flags & B_FS_IS_PERSISTENT) == 0)
return; return;
PrintMountPoint(info.dev, false);
PrintType(info.fsh_name); PrintType(info.fsh_name);
PrintBlocks(info.total_blocks, info.block_size, showBlocks); PrintBlocks(info.total_blocks, info.block_size, showBlocks);
PrintBlocks(info.free_blocks, info.block_size, showBlocks); PrintBlocks(info.free_blocks, info.block_size, showBlocks);
printf(" "); printf(" ");
PrintFlag(info.flags, B_FS_HAS_QUERY, "Q", "-"); PrintFlag(info.flags, B_FS_HAS_QUERY, 'Q', '-');
PrintFlag(info.flags, B_FS_HAS_ATTR, "A", "-"); PrintFlag(info.flags, B_FS_HAS_ATTR, 'A', '-');
PrintFlag(info.flags, B_FS_HAS_MIME, "M", "-"); PrintFlag(info.flags, B_FS_HAS_MIME, 'M', '-');
PrintFlag(info.flags, B_FS_IS_SHARED, "S", "-"); PrintFlag(info.flags, B_FS_IS_SHARED, 'S', '-');
PrintFlag(info.flags, B_FS_IS_PERSISTENT, "P", "-"); PrintFlag(info.flags, B_FS_IS_PERSISTENT, 'P', '-');
PrintFlag(info.flags, B_FS_IS_REMOVABLE, "R", "-"); PrintFlag(info.flags, B_FS_IS_REMOVABLE, 'R', '-');
PrintFlag(info.flags, B_FS_IS_READONLY, "-", "W"); PrintFlag(info.flags, B_FS_IS_READONLY, '-', 'W');
printf(" %s\n", info.device_name); printf(" %24s ", info.device_name);
PrintMountPoint(info.dev, false);
printf("\n");
} }
@ -237,8 +238,8 @@ main(int argc, char **argv)
// If not, then just iterate over all devices and give a compact summary // If not, then just iterate over all devices and give a compact summary
printf(" Mount Type Total Free Flags Device\n" printf(" Type Total Free Flags Device Mounted on\n"
"----------------- --------- --------- --------- ------- ------------------------\n"); "--------- --------- --------- ------- ------------------------ -----------------\n");
int32 cookie = 0; int32 cookie = 0;
while ((device = next_dev(&cookie)) >= B_OK) { while ((device = next_dev(&cookie)) >= B_OK) {