From: Darrick J. Wong <djwong@kernel.org>
Date: Thu, 16 Jan 2025 21:22:04 +0000 (-0800)
Subject: xfs_db: improve error message when unknown btree type given to btheight
X-Git-Tag: v6.13.0~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c414a08700c550b1d4071e2d19325f004df4a5da;p=xfsprogs-dev.git

xfs_db: improve error message when unknown btree type given to btheight

I found accidentally that if you do this (note 'rmap', not 'rmapbt'):

xfs_db /dev/sda -c 'btheight -n 100 rmap'

The program spits back "Numerical result out of range".  That's the
result of it failing to match "rmap" against a known btree type, and
falling back to parsing the string as if it were a btree geometry
description.

Improve this a little by checking that there's at least one semicolon in
the string so that the error message improves to:

"rmap: expected a btree geometry specification"

Fixes: cb1e69c564c1e0 ("xfs_db: add a function to compute btree geometry")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/db/btheight.c b/db/btheight.c
index 6643489c8..98165b522 100644
--- a/db/btheight.c
+++ b/db/btheight.c
@@ -145,6 +145,12 @@ construct_records_per_block(
 		}
 	}
 
+	p = strchr(tag, ':');
+	if (!p) {
+		fprintf(stderr, _("%s: expected a btree geometry specification.\n"), tag);
+		return -1;
+	}
+
 	toktag = strdup(tag);
 	ret = -1;