scripts: Tweaked corrupt rbyd coloring to include addresses

This matches the coloring in dbglfs.py for other erroneous conditions,
and also matches how we color hidden items when shown.

Also fixed some minor bugs in grm printing.
This commit is contained in:
Christopher Haster
2025-04-05 18:44:33 -05:00
parent e5b430cb8c
commit 202636cccd
4 changed files with 16 additions and 16 deletions

View File

@@ -2992,10 +2992,10 @@ def main(disk, mroots=None, *,
# corrupted?
if not mdir:
if not quiet:
print('{%s}: %s%s%s' % (
print('%s{%s}: %s%s' % (
'\x1b[31m' if color else '',
','.join('%04x' % block
for block in mdir.blocks),
'\x1b[31m' if color else '',
'(corrupted %s %s)' % (
'mroot' if mdir.mid == -1 else 'mdir',
mdir.addr()),
@@ -3008,10 +3008,10 @@ def main(disk, mroots=None, *,
if mdir.mid == -1:
if mdir in mrootseen:
if not quiet:
print('{%s}: %s%s%s' % (
print('%s{%s}: %s%s' % (
'\x1b[31m' if color else '',
','.join('%04x' % block
for block in mdir.blocks),
'\x1b[31m' if color else '',
'(mroot cycle detected %s)' % mdir.addr(),
'\x1b[m' if color else ''))
pmdir = None
@@ -3029,10 +3029,10 @@ def main(disk, mroots=None, *,
# corrupted? try to keep printing the tree
if not rbyd:
if not quiet:
print('%11s: %*s%s%s%s' % (
print('%s%11s: %*s%s%s' % (
'\x1b[31m' if color else '',
'%04x.%04x' % (rbyd.block, rbyd.trunk),
t_width, '',
'\x1b[31m' if color else '',
'(corrupted rbyd %s)' % rbyd.addr(),
'\x1b[m' if color else ''))
pmdir = None