From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D13C0C433EF for ; Tue, 1 Mar 2022 04:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232197AbiCAELU (ORCPT ); Mon, 28 Feb 2022 23:11:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232207AbiCAELT (ORCPT ); Mon, 28 Feb 2022 23:11:19 -0500 Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 897E458E49 for ; Mon, 28 Feb 2022 20:10:38 -0800 (PST) Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id OohUneddugTZYOtqPn7Pq4; Tue, 01 Mar 2022 04:10:37 +0000 Received: from webber.adilger.int ([70.77.221.9]) by cmsmtp with ESMTP id OtqOnaCNOd7RfOtqOn6iX2; Tue, 01 Mar 2022 04:10:37 +0000 X-Authority-Analysis: v=2.4 cv=XrLphHJ9 c=1 sm=1 tr=0 ts=621d9cbd a=2Y6h5+ypAxmHcsumz2f7Og==:117 a=2Y6h5+ypAxmHcsumz2f7Og==:17 a=lB0dNpNiAAAA:8 a=ySfo2T4IAAAA:8 a=bp1g5Iz1D7c7guLF1_8A:9 a=c-ZiYqmG3AbHTdtsH08C:22 a=ZUkhVnNHqyo2at-WnAgH:22 From: Andreas Dilger To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, Andreas Dilger , Li Dongyang Subject: [PATCH] debugfs: allow for ncheck Date: Mon, 28 Feb 2022 21:10:31 -0700 Message-Id: <20220301041031.74615-1-adilger@whamcloud.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfIrbhwfxFXViWRF3OTDlz/Rx8pW0SfMHfXlxYgc9EytuYmBni4/EdVcKN7FClityQ1h3bSmnxBH3NWx53hYa+sVPIgvXsmD1APxGm8t4IxF+0761BeC3 GNvE22ehN7nR68XTMdRi6EqtmLSTadST44x50taVhd3xcaun8AzLS6dLv95HXE3mM5pN+jFMfmZ7guk+uEg1rCbDQdArJaG7QMBSkqK32L3Mold1rR0yX237 Q13lrLdoX61IvqmAPmgZq3Y5eo1d0nP1hWEZvzN62i/HVC/UPsYMrvgAPiMtVTwz Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org If the arg string is of the form , allow it for ncheck. Improve the error message, use "Invalid inode number" instead of "Bad inode", which implies the inode content being bad. Signed-off-by: Li Dongyang Reviewed-by: Andreas Dilger --- debugfs/ncheck.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/debugfs/ncheck.c b/debugfs/ncheck.c index 011f26de..3be4be19 100644 --- a/debugfs/ncheck.c +++ b/debugfs/ncheck.c @@ -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)) -- 2.25.1