> +
> + data = xmalloc(d->length);
we realloc a buffer here where we alloc one in file_digest
and not free it before calling print_digest
> + d->final(d, data);
> +
> + for (i=0; i<d->length; i++)
> + printf("%02x", data[i]);
> +
> + free(data);
> +}
> +
> +static int file_digest(struct digest *d, char *filename,
> + ulong start, ulong size)
> +{
> + ulong len = 0;
> + int fd, now, ret = 0;
> + char *buf;
> +
> + d->init(d);
> +
> + fd = open(filename, O_RDONLY);
> + if (fd < 0) {
> + perror(filename);
> + return fd;
> + }
> +
> + if (start > 0) {
> + ret = lseek(fd, start, SEEK_SET);
> + if (ret == -1) {
> + perror("lseek");
> + goto out;
> + }
> + }
> +
> + buf = xmalloc(4096);
do we really need to allocate the buffer everytime?
> +
> + 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;
> +
> + if (ctrlc()) {
> + ret = -EINTR;
> + goto out_free;
> + }
> +
> + d->update(d, buf, now);
> + size -= now;
> + len += now;
> + }
> +
> + print_digest(d);
> + printf(" %s\t0x%08lx ... 0x%08lx\n", filename, start, start + len);
> +
> +out_free:
> + free(buf);
> +out:
> + close(fd);
> +
> + return ret;
> +}
> +
> +static int do_digest(char *algorithm, int argc, char *argv[])
> +{
> + struct digest *d;
> + int ret = 0;
> +
> + d = digest_get_by_name(algorithm);
> + BUG_ON(!d);
> +
> + if (argc < 2)
> + return COMMAND_ERROR_USAGE;
> +
> + argv++;
> + while (*argv) {
> + char *filename = "/dev/mem";
> + ulong start = 0, size = ~0;
ulong so so if we want to support 64bit vfs we need to use an
other type
> +
> + /* arguments are either file, file+area or area */
> + if (parse_area_spec(*argv, &start, &size)) {
> + filename = *argv;
> + if (argv[1] && !parse_area_spec(argv[1], &start, &size))
> + argv++;
> + }
> +
> + if (file_digest(d, filename, start, size) < 0)
> + ret = 1;
> +
> + argv++;
> + }
> +
> + return ret;
> +}
> +
> +#ifdef CONFIG_CMD_MD5SUM
> +
> +static int do_md5(struct command *cmdtp, int argc, char *argv[])
> +{
> + return do_digest("md5", argc, argv);
pass the cmdtp will be good
I agree it's not necessary now but I think it's a good practice
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
