Merge branch 'main' into rm-correct-prompts

src/bin/uudoc.rs

@@ -170,7 +170,7 @@ impl<'a, 'b> MDWriter<'a, 'b> {
             .render_usage()
             .to_string()
             .lines()
-            .skip(1)
+            .map(|l| l.strip_prefix("Usage:").unwrap_or(l))
             .map(|l| l.trim())
             .filter(|l| !l.is_empty())
             .collect::<Vec<_>>()

src/uu/cut/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/cut.rs"
 clap = { version = "4.0", features = ["wrap_help", "cargo"] }
 uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
 memchr = "2"
-bstr = "0.2"
+bstr = "1.0"
 atty = "0.2"
 
 [[bin]]

src/uu/cut/src/cut.rs

@@ -145,7 +145,7 @@ fn list_to_ranges(list: &str, complement: bool) -> Result<Vec<Range>, String> {
 
 fn cut_bytes<R: Read>(reader: R, ranges: &[Range], opts: &Options) -> UResult<()> {
     let newline_char = if opts.zero_terminated { b'\0' } else { b'\n' };
-    let buf_in = BufReader::new(reader);
+    let mut buf_in = BufReader::new(reader);
     let mut out = stdout_writer();
     let delim = opts
         .out_delim
@@ -189,7 +189,7 @@ fn cut_fields_delimiter<R: Read>(
     newline_char: u8,
     out_delim: &str,
 ) -> UResult<()> {
-    let buf_in = BufReader::new(reader);
+    let mut buf_in = BufReader::new(reader);
     let mut out = stdout_writer();
     let input_delim_len = delim.len();
 
@@ -273,7 +273,7 @@ fn cut_fields<R: Read>(reader: R, ranges: &[Range], opts: &FieldOptions) -> URes
         );
     }
 
-    let buf_in = BufReader::new(reader);
+    let mut buf_in = BufReader::new(reader);
     let mut out = stdout_writer();
     let delim_len = opts.delimiter.len();
 

src/uu/split/src/split.rs

@@ -38,8 +38,9 @@ static OPT_HEX_SUFFIXES: &str = "hex-suffixes";
 static OPT_SUFFIX_LENGTH: &str = "suffix-length";
 static OPT_DEFAULT_SUFFIX_LENGTH: &str = "0";
 static OPT_VERBOSE: &str = "verbose";
-//The ---io-blksize parameter is consumed and ignored.
+//The ---io and ---io-blksize parameters are consumed and ignored.
 //The parameter is included to make GNU coreutils tests pass.
+static OPT_IO: &str = "-io";
 static OPT_IO_BLKSIZE: &str = "-io-blksize";
 static OPT_ELIDE_EMPTY_FILES: &str = "elide-empty-files";
 
@@ -154,6 +155,13 @@ pub fn uu_app() -> Command {
                 .help("print a diagnostic just before each output file is opened")
                 .action(ArgAction::SetTrue),
         )
+        .arg(
+            Arg::new(OPT_IO)
+                .long(OPT_IO)
+                .alias(OPT_IO)
+                .takes_value(true)
+                .hide(true),
+        )
         .arg(
             Arg::new(OPT_IO_BLKSIZE)
                 .long("io-blksize")
@@ -912,11 +920,23 @@ impl<'a> Write for LineBytesChunkWriter<'a> {
                 // then move on to the next chunk if necessary.
                 None => {
                     let end = self.num_bytes_remaining_in_current_chunk;
+
+                    // This is ugly but here to match GNU behavior. If the input
+                    // doesn't end with a \n, pretend that it does for handling
+                    // the second to last segment chunk. See `line-bytes.sh`.
+                    if end == buf.len()
+                        && self.num_bytes_remaining_in_current_chunk
+                            < self.chunk_size.try_into().unwrap()
+                        && buf[buf.len() - 1] != b'\n'
+                    {
+                        self.num_bytes_remaining_in_current_chunk = 0;
+                    } else {
                         let num_bytes_written = self.inner.write(&buf[..end.min(buf.len())])?;
                         self.num_bytes_remaining_in_current_chunk -= num_bytes_written;
                         total_bytes_written += num_bytes_written;
                         buf = &buf[num_bytes_written..];
                     }
+                }
 
                 // If there is a newline character and the line
                 // (including the newline character) will fit in the

tests/by-util/test_cp.rs

@@ -1395,7 +1395,7 @@ fn test_cp_reflink_bad() {
         .arg(TEST_HELLO_WORLD_SOURCE)
         .arg(TEST_EXISTING_FILE)
         .fails()
-        .stderr_contains("error: \"bad\" isn't a valid value for '--reflink[=<WHEN>]'");
+        .stderr_contains("error: 'bad' isn't a valid value for '--reflink[=<WHEN>]'");
 }
 
 #[test]

tests/by-util/test_mknod.rs

@@ -92,14 +92,14 @@ fn test_mknod_character_device_requires_major_and_minor() {
         .arg("1")
         .arg("c")
         .fails()
-        .stderr_contains("Invalid value \"c\"");
+        .stderr_contains("Invalid value 'c'");
     new_ucmd!()
         .arg("test_file")
         .arg("c")
         .arg("c")
         .arg("1")
         .fails()
-        .stderr_contains("Invalid value \"c\"");
+        .stderr_contains("Invalid value 'c'");
 }
 
 #[test]

tests/by-util/test_split.rs

@@ -659,6 +659,22 @@ fn test_line_bytes_no_empty_file() {
     assert!(!at.plus("xak").exists());
 }
 
+#[test]
+fn test_line_bytes_no_eof() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["-C", "3"])
+        .pipe_in("1\n2222\n3\n4")
+        .succeeds()
+        .no_stdout()
+        .no_stderr();
+    assert_eq!(at.read("xaa"), "1\n");
+    assert_eq!(at.read("xab"), "222");
+    assert_eq!(at.read("xac"), "2\n");
+    assert_eq!(at.read("xad"), "3\n");
+    assert_eq!(at.read("xae"), "4");
+    assert!(!at.plus("xaf").exists());
+}
+
 #[test]
 fn test_guard_input() {
     let ts = TestScenario::new(util_name!());

tests/fixtures/split/noeof.txt

@@ -0,0 +1,4 @@
+1
+2222
+3
+4