From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 68.mail-out.ovh.net ([91.121.185.69]) by canuck.infradead.org with smtp (Exim 4.72 #1 (Red Hat Linux)) id 1P5JUr-00088r-Mx for barebox@lists.infradead.org; Mon, 11 Oct 2010 14:37:05 +0000 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 11 Oct 2010 16:34:40 +0200 Message-Id: <1286807684-17355-2-git-send-email-plagnioj@jcrosoft.com> In-Reply-To: <20101011135329.GA7412@game.jcrosoft.org> References: <20101011135329.GA7412@game.jcrosoft.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 2/6] commands/crc32: add compare 2 files crc To: barebox@lists.infradead.org add -F options to compare to file crc it's usefull to compare what you flash in a partition it's selectable by CONFIG_CMD_CRC_CMP Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- commands/Kconfig | 5 ++ commands/crc.c | 111 ++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 79 insertions(+), 37 deletions(-) diff --git a/commands/Kconfig b/commands/Kconfig index 0fc80aa..5416073 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -202,6 +202,11 @@ config CMD_CRC select CRC32 prompt "crc" +config CMD_CRC_CMP + tristate + depends on CMD_CRC + prompt "compare 2 files crc" + config CMD_MTEST tristate prompt "mtest" diff --git a/commands/crc.c b/commands/crc.c index 4842cdc..d3e0865 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -30,20 +30,80 @@ #include #include +static int file_crc(char* filename, ulong start, ulong size, ulong *crc, + ulong *total) +{ + int fd, now; + int ret = 0; + char *buf; + + *total = 0; + *crc = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0) { + printf("open %s: %s\n", filename, errno_str()); + return fd; + } + + if (start > 0) { + ret = lseek(fd, start, SEEK_SET); + if (ret == -1) { + perror("lseek"); + goto out; + } + } + + buf = xmalloc(4096); + + while (size) { + now = min((ulong)4096, size); + now = read(fd, buf, now); + if (now < 0) { + ret = now; + perror("read"); + goto out_free; + } + if (!now) + break; + *crc = crc32(*crc, buf, now); + size -= now; + *total += now; + } + + printf ("CRC32 for %s 0x%08lx ... 0x%08lx ==> 0x%08lx", + filename, start, start + *total - 1, *crc); + +out_free: + free(buf); +out: + close(fd); + + return ret; +} + static int do_crc(struct command *cmdtp, int argc, char *argv[]) { ulong start = 0, size = ~0, total = 0; ulong crc = 0, vcrc = 0; char *filename = "/dev/mem"; - char *buf; - int fd, opt, err = 0, filegiven = 0, verify = 0, now; +#ifdef CONFIG_CMD_CRC_CMP + char *vfilename = NULL; +#endif + int opt, err = 0, filegiven = 0, verify = 0; - while((opt = getopt(argc, argv, "f:v:")) > 0) { + while((opt = getopt(argc, argv, "f:F:v:")) > 0) { switch(opt) { case 'f': filename = optarg; filegiven = 1; break; +#ifdef CONFIG_CMD_CRC_CMP + case 'F': + verify = 1; + vfilename = optarg; + break; +#endif case 'v': verify = 1; vcrc = simple_strtoul(optarg, NULL, 0); @@ -61,38 +121,17 @@ static int do_crc(struct command *cmdtp, int argc, char *argv[]) } } - fd = open(filename, O_RDONLY); - if (fd < 0) { - printf("open %s: %s\n", filename, errno_str()); + if (file_crc(filename, start, size, &crc, &total) < 0) return 1; - } - if (start > 0) { - if (lseek(fd, start, SEEK_SET) == -1) { - perror("lseek"); - err = 1; - goto out; - } - } - - buf = xmalloc(4096); - - while (size) { - now = min((ulong)4096, size); - now = read(fd, buf, now); - if (now < 0) { - perror("read"); - goto out_free; - } - if (!now) - break; - crc = crc32(crc, buf, now); - size -= now; - total += now; +#ifdef CONFIG_CMD_CRC_CMP + if (vfilename) { + size = total; + puts("\n"); + if (file_crc(vfilename, start, size, &vcrc, &total) < 0) + return 1; } - - printf ("CRC32 for %s 0x%08lx ... 0x%08lx ==> 0x%08lx", - filename, start, start + total - 1, crc); +#endif if (verify && crc != vcrc) { printf(" != 0x%08x ** ERROR **", vcrc); @@ -101,11 +140,6 @@ static int do_crc(struct command *cmdtp, int argc, char *argv[]) printf("\n"); -out_free: - free(buf); -out: - close(fd); - return err; } @@ -114,6 +148,9 @@ static const __maybe_unused char cmd_crc_help[] = "Calculate a crc32 checksum of a memory area\n" "Options:\n" " -f Use file instead of memory\n" +#ifdef CONFIG_CMD_CRC_CMP +" -F Use file to compare\n" +#endif " -v Verfify\n"; BAREBOX_CMD_START(crc32) -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox