Skip to contentSkip to conversation

debugfs: allow <inode> for ncheck

PATCH Applied Andreas Dilger 2 participants 2 messages Mar 1, 2022 – Aug 13, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 debugfs: allow <inode> for ncheck

If the arg string is of the form <ino>, allow it for ncheck. Improve the error message, use "Invalid inode number" instead of "Bad inode", which implies the inode content being bad.

---
 debugfs/ncheck.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
debugfs/ncheck.c +14 -2
index 011f26de..3be4be19 100644
@@ -134,9 +134,21 @@ void do_ncheck(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
 
 	iw.names_left = 0;
 	for (i=0; i < argc; i++) {
-		iw.iarray[i] = strtol(argv[i], &tmp, 0);
+		char *str = argv[i];
+		int len = strlen(str);
+
+		if ((len > 2) && (str[0] == '<') && (str[len-1] == '>')) {
+			str[len-1] = '\0';
+			str++;
+		}
+		iw.iarray[i] = strtol(str, &tmp, 0);
 		if (*tmp) {
-			com_err("ncheck", 0, "Bad inode - %s", argv[i]);
+			if (str != argv[i]) {
+				str--;
+				str[len-1] = '>';
+			}
+			com_err("ncheck", 0, "Invalid inode number - '%s'",
+				argv[i]);
 			goto error_out;
 		}
 		if (debugfs_read_inode(iw.iarray[i], &inode, *argv))
Signature · 1 line
2.25.1