@matheusbsbs / matheus-bagliano / commits / 53039ab154

Avoid difference in tr semantics between System V and BSD

Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V semantics for tr whereby string1's length is truncated to the length of string2 if string2 is shorter. The BSD semantics, as used by GNU tr see string2 padded to the length of string1 using the final character in string2. POSIX explicitly doesn't specify the correct behavior here, making both equally valid. This difference means that Solaris' native tr implementations produce different results for tr ":\t\n" "\0" than GNU tr. This breaks a few tests in t0008-ignores.sh. Possible fixes for this are to make string2 be "\0\0\0" or "[\0*]". Instead, use perl to perform these transliterations which means we don't need to worry about the difference at all. Since we're replacing tr with perl, we also use perl to replace the sed invocations used to transform the files. Replace four identical transforms with a function named broken_c_unquote. Replace the other two identical transforms with a fuction named broken_c_unquote_verbose. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ben Walton committed Oct 28, 2013 at 21:43 UTC 53039ab15490d8f957f728cbe018e329924ad326
1 file changed +18 -12
t/t0008-ignores.sh
+18 -12
@@ -37,6 +37,14 @@ test_stderr () {
37 test_cmp "$HOME/expected-stderr" "$HOME/stderr"
38 }
39
40 +broken_c_unquote () {
41 + "$PERL_PATH" -pe 's/^"//; s/\\//; s/"$//; tr/\n/\0/' "$@"
42 +}
43 +
44 +broken_c_unquote_verbose () {
45 + "$PERL_PATH" -pe 's/ "/ /; s/\\//; s/"$//; tr/:\t\n/\0/' "$@"
46 +}
47 +
48 stderr_contains () {
49 regexp="$1"
50 if grep "$regexp" "$HOME/stderr"
@@ -606,12 +614,11 @@ cat <<-EOF >expected-verbose
614 $global_excludes:2:!globaltwo b/globaltwo
615 EOF
616
609 -sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
610 - tr "\n" "\0" >stdin0
611 -sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \
612 - tr "\n" "\0" >expected-default0
613 -sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \
614 - tr ":\t\n" "\0" >expected-verbose0
617 +broken_c_unquote stdin >stdin0
618 +
619 +broken_c_unquote expected-default >expected-default0
620 +
621 +broken_c_unquote_verbose expected-verbose >expected-verbose0
622
623 test_expect_success '--stdin' '
624 expect_from_stdin <expected-default &&
@@ -692,12 +699,11 @@ EOF
699 grep -v '^:: ' expected-all >expected-verbose
700 sed -e 's/.* //' expected-verbose >expected-default
701
695 -sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
696 - tr "\n" "\0" >stdin0
697 -sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \
698 - tr "\n" "\0" >expected-default0
699 -sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \
700 - tr ":\t\n" "\0" >expected-verbose0
702 +broken_c_unquote stdin >stdin0
703 +
704 +broken_c_unquote expected-default >expected-default0
705 +
706 +broken_c_unquote_verbose expected-verbose >expected-verbose0
707
708 test_expect_success '--stdin from subdirectory' '
709 expect_from_stdin <expected-default &&