From 34c22dc3ad359ebdd08ebbfcf6d3651c433de2df Mon Sep 17 00:00:00 2001
From: Jan Scheer <jhscheer@users.noreply.github.com>
Date: Sun, 2 May 2021 12:15:16 +0200
Subject: [PATCH] tr: fix complement if set2 is range

---
 src/uu/tr/src/tr.rs      |  2 +-
 tests/by-util/test_tr.rs | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs
index b1143b4bb..68543229e 100644
--- a/src/uu/tr/src/tr.rs
+++ b/src/uu/tr/src/tr.rs
@@ -149,7 +149,7 @@ impl TranslateOperation {
         TranslateOperation {
             translate_map: map,
             complement,
-            s2_last: s2_prev,
+            s2_last: set2.last().unwrap_or(s2_prev),
         }
     }
 }
diff --git a/tests/by-util/test_tr.rs b/tests/by-util/test_tr.rs
index 064fbf779..f840dee62 100644
--- a/tests/by-util/test_tr.rs
+++ b/tests/by-util/test_tr.rs
@@ -86,6 +86,26 @@ fn test_complement3() {
         .stdout_is("3he3ca33a3d33he3ba3");
 }
 
+#[test]
+fn test_complement4() {
+    // $ echo -n '0x1y2z3' | tr -c '0-@' '*-~'
+    // 0~1~2~3
+    new_ucmd!()
+        .args(&["-c", "0-@", "*-~"])
+        .pipe_in("0x1y2z3")
+        .run()
+        .stdout_is("0~1~2~3");
+
+    // TODO: fix this
+    // $ echo '0x1y2z3' | tr -c '\0-@' '*-~'
+    // 0a1b2c3
+    // new_ucmd!()
+    //     .args(&["-c", "\\0-@", "*-~"])
+    //     .pipe_in("0x1y2z3")
+    //     .run()
+    //     .stdout_is("0a1b2c3");
+}
+
 #[test]
 fn test_squeeze() {
     new_ucmd!()