[PATCH] commands/digest: don't print checksum for non-existing files

[PATCH] commands/digest: don't print checksum for non-existing files

[Antony Pavlov]

This fixes the case:

  barebox:/ md5sum non-existing-file
  non-existing-file: No such file or directory
  00000000000000000000000000000000  non-existing-file     0x00000000 ... 0xffffffffffffffff
  barebox:/

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 commands/digest.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/commands/digest.c b/commands/digest.c
index 07cbec9..e334a40 100644
--- a/commands/digest.c
+++ b/commands/digest.c
@@ -62,11 +62,13 @@ static int do_digest(char *algorithm, int argc, char *argv[])
 
 		if (digest_file_window(d, filename, hash, start, size) < 0)
 			ret = 1;
+		else {
+			for (i = 0; i < d->length; i++)
+				printf("%02x", hash[i]);
 
-		for (i = 0; i < d->length; i++)
-			printf("%02x", hash[i]);
-
-		printf("  %s\t0x%08llx ... 0x%08llx\n", filename, start, start + size);
+			printf("  %s\t0x%08llx ... 0x%08llx\n",
+				filename, start, start + size);
+		}
 
 		argv++;
 	}
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] commands/digest: don't print checksum for non-existing files

[Sascha Hauer]

On Thu, Aug 23, 2012 at 11:21:11PM +0400, Antony Pavlov wrote:
> This fixes the case:
> 
>   barebox:/ md5sum non-existing-file
>   non-existing-file: No such file or directory
>   00000000000000000000000000000000  non-existing-file     0x00000000 ... 0xffffffffffffffff
>   barebox:/
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>

Applied, thanks

Sascha

> ---
>  commands/digest.c |   10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/commands/digest.c b/commands/digest.c
> index 07cbec9..e334a40 100644
> --- a/commands/digest.c
> +++ b/commands/digest.c
> @@ -62,11 +62,13 @@ static int do_digest(char *algorithm, int argc, char *argv[])
>  
>  		if (digest_file_window(d, filename, hash, start, size) < 0)
>  			ret = 1;
> +		else {
> +			for (i = 0; i < d->length; i++)
> +				printf("%02x", hash[i]);
>  
> -		for (i = 0; i < d->length; i++)
> -			printf("%02x", hash[i]);
> -
> -		printf("  %s\t0x%08llx ... 0x%08llx\n", filename, start, start + size);
> +			printf("  %s\t0x%08llx ... 0x%08llx\n",
> +				filename, start, start + size);
> +		}
>  
>  		argv++;
>  	}
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox