morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 17:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

dissect-tool: show sector/image size from DissectedImage object

Browse Source 
The information is provided to us already in the structure now, hence
use it.
This commit is contained in:
Lennart Poettering
2023-12-04 18:25:54 +01:00
parent 51778dea0d
commit 5b1b37c86a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dissect/dissect.c
View File

@@ -827,16 +827,15 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
if (arg_json_format_flags & (JSON_FORMAT_OFF|JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO))
pager_open(arg_pager_flags);
if (arg_json_format_flags & JSON_FORMAT_OFF)
printf(" Name: %s%s%s\n", ansi_highlight(), bn, ansi_normal());
if (ioctl(d->fd, BLKGETSIZE64, &size) < 0)
log_debug_errno(errno, "Failed to query size of loopback device: %m");
else if (arg_json_format_flags & JSON_FORMAT_OFF)
printf(" Size: %s\n", FORMAT_BYTES(size));
if (arg_json_format_flags & JSON_FORMAT_OFF) {
printf(" Sec. Size: %" PRIu32 "\n", m->sector_size);
printf(" Name: %s%s%s\n",
ansi_highlight(), bn, ansi_normal());
printf(" Size: %s\n",
FORMAT_BYTES(m->image_size));
printf(" Sec. Size: %" PRIu32 "\n",
m->sector_size);
printf(" Arch.: %s\n",
strna(architecture_to_string(dissected_image_architecture(m))));