From c9f4c323220f51a42e3da8ea79f9ddcedab041b9 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Thu, 2 Aug 2012 13:31:50 +0200 Subject: md5sum, sha*sum: add --tag to output a format indicating the algorithm The format used is the BSD traditional format which looks like: MD5 (/dev/null) = d41d8cd98f00b204e9800998ecf8427e * NEWS: Add new feature info. * doc/coreutils.texi (md5sum invocation): Add detailed information about the new --tag option. * src/md5sum.c: Add the new --tag option for BSD-style output. (bsd_split_3): Add ESCAPED_FILENAME parameter. (print_filename): New function refactored from main(). (filename_unescape): New function refactored from split_3(). * tests/misc/md5sum-bsd: Add tests for the new feature. --- tests/misc/md5sum-bsd | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'tests/misc/md5sum-bsd') diff --git a/tests/misc/md5sum-bsd b/tests/misc/md5sum-bsd index 8226d7ab7..ce4117679 100755 --- a/tests/misc/md5sum-bsd +++ b/tests/misc/md5sum-bsd @@ -1,5 +1,6 @@ #!/bin/sh -# make sure 'md5sum -c' works for alternate BSD format (md5 -r) +# 'md5sum' tests for generation and checking of +# BSD traditional and alternate formats (md5 [-r]) # Copyright (C) 2011-2012 Free Software Foundation, Inc. @@ -19,6 +20,9 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ md5sum +## BSD alternate format tests ## + +# Ensure we can --check BSD alternate format. # Note we start this list with a name # that's unambiguous in BSD format. # I.E. one not starting with ' ' or '*' @@ -38,4 +42,47 @@ md5sum --strict -c check.md5 || fail=1 # an option to avoid the ambiguity. tail -n+2 check.md5 | md5sum --strict -c && fail=1 + +## BSD traditional format tests (--tag option) ## + +# Ensure --tag and --check are mutually exclusive +md5sum --tag --check /dev/null && fail=1 + +# Ensure --tag and --text are mutually exclusive +# We don't support --text with BSD tradition format, +# as that would complicate the output format, +# while providing little benefit over --text processing +# available with the default md5sum output format. +md5sum --tag --text /dev/null && fail=1 + +# Ensure we can --check BSD traditional format we produce +rm check.md5 +for i in 'a' ' b' '*c' 'dd' ' '; do + echo "$i" > "$i" + md5sum --tag "$i" >> check.md5 +done +md5sum --strict -c check.md5 || fail=1 + +# Ensure we can --check BSD traditional format we produce +# with the GNU extension of escaped newlines +nl=' +' +tab=' ' +rm check.md5 +for i in 'a\b' 'a\' "a${nl}b" "a${tab}b"; do + :> "$i" + md5sum --tag "$i" >> check.md5 +done +md5sum --strict -c check.md5 || fail=1 + +# Ensure BSD traditional format with GNU extension escapes +# is in the expected format +ex_file='test +\\file' +ex_output='\MD5 (test\n\\\\file) = d41d8cd98f00b204e9800998ecf8427e' +touch "$ex_file" +printf "%s\n" "$ex_output" > exp +md5sum --tag "$ex_file" > out +compare exp out || fail=1 + Exit $fail -- cgit v1.2.3-54-g00ecf