From: David Bremner <bremner@debian.org> The problem is a use of signed chars in places where unsigned chars (i.e. 0-255) should be used. --- Well, I did mention more tests were needed ;). I failed to test 8 bit (>127) stuff and sure enough it was broken. This sets up some tests to demonstrate the problem and the next patch fixes it. test/dump-restore | 9 +++++++-- test/hex-escaping | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/test/dump-restore b/test/dump-restore index 122de5c..eee1773 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -106,11 +106,15 @@ enc1=$($TEST_DIRECTORY/hex-xcode e "$tag1") tag2=$(printf 'this\n tag\t has\n spaces') enc2=$($TEST_DIRECTORY/hex-xcode e "$tag2") +enc3='%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' +tag3=$($TEST_DIRECTORY/hex-xcode d $enc3) + notmuch dump --format=notmuch > BACKUP -notmuch tag +"$tag1" +"$tag2" -inbox -unread "*" +notmuch tag +"$tag1" +"$tag2" +"$tag3" -inbox -unread "*" test_begin_subtest 'format=notmuch, round trip with strange tags' + test_subtest_known_broken notmuch dump --format=notmuch > EXPECTED.$test_count notmuch dump --format=notmuch | notmuch restore --format=notmuch notmuch dump --format=notmuch > OUTPUT.$test_count @@ -118,9 +122,10 @@ test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_begin_subtest 'format=notmuch, checking encoded output' + test_subtest_known_broken cp /dev/null EXPECTED.$test_count notmuch dump --format=notmuch -- from:cworth |\ - awk "{ print \$1 \" $enc1 $enc2\" }" > EXPECTED.$test_count + awk "{ print \$1 \" $enc1 $enc2 $enc3\" }" > EXPECTED.$test_count notmuch dump --format=notmuch -- from:cworth > OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count diff --git a/test/hex-escaping b/test/hex-escaping index d0a993e..2053fb0 100755 --- a/test/hex-escaping +++ b/test/hex-escaping @@ -17,4 +17,11 @@ printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count $TEST_DIRECTORY/hex-xcode e < EXPECTED.$test_count |\ $TEST_DIRECTORY/hex-xcode d > OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +test_begin_subtest "round trip 8bit chars" +test_subtest_known_broken +echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count +$TEST_DIRECTORY/hex-xcode d < EXPECTED.$test_count |\ + $TEST_DIRECTORY/hex-xcode e > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_done -- 1.7.7.3