From patchwork Mon Jul 19 17:33:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 59213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D39DDB6EF2 for ; Tue, 20 Jul 2010 03:35:33 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OauDq-0005GM-Cy; Mon, 19 Jul 2010 17:33:46 +0000 Received: from mms1.broadcom.com ([216.31.210.17]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OauDk-0005FE-U6 for linux-mtd@lists.infradead.org; Mon, 19 Jul 2010 17:33:41 +0000 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Mon, 19 Jul 2010 10:33:30 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-12.broadcom.com (10.11.16.101) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Mon, 19 Jul 2010 10:34:51 -0700 Received: from localhost.localdomain (ld-irv-0074.broadcom.com [10.12.160.50]) by mail-irva-12.broadcom.com (Postfix) with ESMTP id 7C28069CA8; Mon, 19 Jul 2010 10:33:30 -0700 (PDT) From: "Brian Norris" To: "Artem Bityutskiy" Subject: [PATCH v2 3/6] mtd-utils/nanddump.c: Add canonical (hex+ascii) flag Date: Mon, 19 Jul 2010 10:33:15 -0700 Message-ID: <1279560796-6388-2-git-send-email-norris@broadcom.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1279437819.16247.19.camel@localhost.localdomain> References: <1279437819.16247.19.camel@localhost.localdomain> MIME-Version: 1.0 X-WSS-ID: 605A53E037O28169937-01-01 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100719_133341_188017_343278B5 X-CRM114-Status: GOOD ( 12.78 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: linux-mtd@lists.infradead.org, Brian Norris X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Added the "-c" or "--canonicalprint" flag (modelled off 'hexdump -C') so that users can choose to print ASCII output next to the prettyprint output. This is really an extension to the prettyprint option, so the two options do not conflict if they are both included in the same execution. Signed-off-by: Brian Norris --- nanddump.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nanddump.c b/nanddump.c index eccb651..cd018c6 100644 --- a/nanddump.c +++ b/nanddump.c @@ -45,6 +45,7 @@ static void display_help (void) "\n" " --help Display this help and exit\n" " --version Output version information and exit\n" +"-c --canonicalprint Print canonical Hex+ASCII dump\n" "-f file --file=file Dump to file\n" "-i --ignoreerrors Ignore errors\n" "-l length --length=length Length\n" @@ -74,7 +75,7 @@ static void display_version (void) // Option variables static bool ignoreerrors = false; // ignore errors -static bool pretty_print = false; // print nice in ascii +static bool pretty_print = false; // print nice static bool noecc = false; // don't error correct static bool omitoob = false; // omit oob data static unsigned long start_addr; // start address @@ -83,7 +84,7 @@ static const char *mtddev; // mtd device name static const char *dumpfile; // dump file name static bool omitbad = false; static bool quiet = false; // suppress diagnostic output -static bool canonical = false; +static bool canonical = false; // print nice + ascii static void process_options (int argc, char * const argv[]) { @@ -91,10 +92,11 @@ static void process_options (int argc, char * const argv[]) for (;;) { int option_index = 0; - static const char *short_options = "bs:f:il:opqn"; + static const char *short_options = "bs:f:il:opqnc"; static const struct option long_options[] = { {"help", no_argument, 0, 0}, {"version", no_argument, 0, 0}, + {"canonicalprint", no_argument, 0, 'c'}, {"file", required_argument, 0, 'f'}, {"ignoreerrors", no_argument, 0, 'i'}, {"prettyprint", no_argument, 0, 'p'}, @@ -145,6 +147,8 @@ static void process_options (int argc, char * const argv[]) case 'o': omitoob = true; break; + case 'c': + canonical = true; case 'p': pretty_print = true; break;