From 4d94e65d06772c41b8ac11e8b55f749c57c18f5b Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Fri, 1 Nov 2013 16:14:44 +0000 Subject: maint: simplify printing of md5sum file names * src/md5sum.c (main): Add a comment as to why we continue to escape names that do not have '\n' but do have '\\' chars. (print_filename): Use the predetermined boolean to decide whether to escape or not, so that in the common case we can output the file name directly, rather than inspecting each char. * tests/misc/md5sum.pl: Add case to show '\\' chars cause escaping. * tests/misc/sha1sum.pl: Likewise. --- tests/misc/md5sum.pl | 4 +++- tests/misc/sha1sum.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/misc/md5sum.pl b/tests/misc/md5sum.pl index 5192d55f4..a89fa62cc 100755 --- a/tests/misc/md5sum.pl +++ b/tests/misc/md5sum.pl @@ -38,7 +38,9 @@ my @Tests = {OUT=>"d174ab98d277d9f5a5611c2c9f419d9f f\n"}], ['7', {IN=> {f=> '1234567890' x 8}}, {OUT=>"57edf4a22be3c955ac49da2e2107b67a f\n"}], - ['backslash', {IN=> {".\\foo"=> ''}}, + ['backslash-1', {IN=> {".\nfoo"=> ''}}, + {OUT=>"\\$degenerate .\\nfoo\n"}], + ['backslash-2', {IN=> {".\\foo"=> ''}}, {OUT=>"\\$degenerate .\\\\foo\n"}], ['check-1', '--check', {AUX=> {f=> ''}}, {IN=> {'f.md5' => "$degenerate f\n"}}, diff --git a/tests/misc/sha1sum.pl b/tests/misc/sha1sum.pl index 327c4dd89..730ca0804 100755 --- a/tests/misc/sha1sum.pl +++ b/tests/misc/sha1sum.pl @@ -44,7 +44,9 @@ my @Tests = {OUT=>"50abf5706a150990a08b2c5ea40fa0e585554732 f\n"}], ['million-a', {IN=> {f=> 'a' x 1000000}}, {OUT=>"34aa973cd4c4daa4f61eeb2bdbad27316534016f f\n"}], - ['bs-sha', {IN=> {".\\foo"=> ''}}, + ['bs-sha-1', {IN=> {".\nfoo"=> ''}}, + {OUT=>"\\$sha_degenerate .\\nfoo\n"}], + ['bs-sha-2', {IN=> {".\\foo"=> ''}}, {OUT=>"\\$sha_degenerate .\\\\foo\n"}], # The sha1sum and md5sum drivers share a lot of code. # Ensure that sha1sum does *not* share the part that makes -- cgit v1.2.3-54-g00ecf