Merge branch 'main' into gitattributes

.vscode/extensions.json

@@ -1,10 +1,8 @@
-{
 // spell-checker:ignore (misc) matklad
 // see <http://go.microsoft.com/fwlink/?LinkId=827846> for the documentation about the extensions.json format
+{
   "recommendations": [
     // Rust language support.
-    "rust-lang.rust",
-    // Provides support for rust-analyzer: novel LSP server for the Rust programming language.
     "matklad.rust-analyzer",
     // `cspell` spell-checker support
     "streetsidesoftware.code-spell-checker"

src/uu/echo/src/echo.rs

@@ -88,10 +88,7 @@ fn print_escaped(input: &str, mut output: impl Write) -> io::Result<bool> {
                         start = 0;
                         next
                     }),
-                    '0' => parse_code(&mut iter, 8, 3, 3).unwrap_or_else(|| {
+                    '0' => parse_code(&mut iter, 8, 3, 3).unwrap_or('\0'),
-                        start = 0;
-                        next
-                    }),
                     _ => {
                         start = 0;
                         next

tests/by-util/test_echo.rs

@@ -138,11 +138,19 @@ fn test_escape_short_octal() {
 }
 
 #[test]
-fn test_escape_no_octal() {
+fn test_escape_nul() {
     new_ucmd!()
         .args(&["-e", "foo\\0 bar"])
         .succeeds()
-        .stdout_only("foo\\0 bar\n");
+        .stdout_only("foo\0 bar\n");
+}
+
+#[test]
+fn test_escape_octal_invalid_digit() {
+    new_ucmd!()
+        .args(&["-e", "foo\\08 bar"])
+        .succeeds()
+        .stdout_only("foo\u{0}8 bar\n");
 }
 
 #[test]