Merge branch 'main' into date-positional-set-format

Author: aguimaraes

.github/workflows/GnuComment.yml

@@ -49,14 +49,44 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            var fs = require('fs');
-            var issue_number = Number(fs.readFileSync('./NR'));
-            var content = fs.readFileSync('./result.txt');
-            if (content.toString().trim().length > 7) { // 7 because we have backquote + \n
+            const fs = require('fs');
+            if (!fs.existsSync('./NR') || !fs.existsSync('./result.txt')) {
+              core.info("No GNU comment payload to post.");
+              return;
+            }
+            const issue_number = Number(fs.readFileSync('./NR'));
+            if (!issue_number) {
+              core.info('No PR number; skipping.');
+              return;
+            }
+            const content = fs.readFileSync('./result.txt').toString();
+
+            const marker = '<!-- gnu-comment-bot -->';
+            const body = `${marker}\nGNU testsuite comparison:\n\`\`\`\n${content}\n\`\`\``;
+
+            const { data: comments } = await github.rest.issues.listComments({
+              ...context.repo,
+              issue_number
+            });
+
+            const existing = comments.find(c =>
+              c.user.login === 'github-actions[bot]' &&
+              c.body.includes(marker)
+            );
+
+            if (existing) {
+              await github.rest.issues.updateComment({
+                ...context.repo,
+                comment_id: existing.id,
+                body
+              });
+            } else {
+              if (content.trim().length <= 7) { // 7 because we have backquote + \n
+                return;
+              }
               await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issue_number,
-                body: 'GNU testsuite comparison:\n```\n' + content + '```'
+                ...context.repo,
+                issue_number,
+                body
               });
             }

Cargo.lock

@@ -398,7 +398,7 @@ clap_complete = "4.4"
 clap_mangen = "0.3"
 compare = "0.1.0"
 crossterm = { version = "0.29.0", default-features = false }
-ctor = "0.9.0"
+ctor = "0.10.0"
 ctrlc = { version = "3.5.2", features = ["termination"] }
 divan = { package = "codspeed-divan-compat", version = "4.4.1" }
 dns-lookup = { version = "3.0.0" }
@@ -487,7 +487,6 @@ digest = "0.10.7"
 
 # Fluent dependencies
 fluent = "0.17.0"
-fluent-bundle = "0.16.0"
 unic-langid = "0.9.6"
 fluent-syntax = "0.12.0"
 

Cargo.toml

@@ -479,10 +479,12 @@ fn get_input_type(path: &OsString) -> CatResult<InputType> {
 fn write_fast<R: FdReadable>(handle: &mut InputHandle<R>) -> CatResult<()> {
     let stdout = io::stdout();
     #[cfg(any(target_os = "linux", target_os = "android"))]
+    let mut stdout = stdout;
+    #[cfg(any(target_os = "linux", target_os = "android"))]
     {
         // If we're on Linux or Android, try to use the splice() system call
         // for faster writing. If it works, we're done.
-        if !splice::write_fast_using_splice(handle, &stdout)? {
+        if !splice::write_fast_using_splice(handle, &mut stdout)? {
             return Ok(());
         }
     }

fuzz/Cargo.lock

@@ -4,13 +4,11 @@
 // file that was distributed with this source code.
 use super::{CatResult, FdReadable, InputHandle};
 
-use rustix::io::{read, write};
+use std::io::{Read, Write};
 use std::os::{fd::AsFd, unix::io::AsRawFd};
 
 use uucore::pipes::{MAX_ROOTLESS_PIPE_SIZE, might_fuse, pipe, splice, splice_exact};
 
-const BUF_SIZE: usize = 1024 * 16;
-
 /// This function is called from `write_fast()` on Linux and Android. The
 /// function `splice()` is used to move data between two file descriptors
 /// without copying between kernel and user spaces. This results in a large
@@ -19,14 +17,14 @@ const BUF_SIZE: usize = 1024 * 16;
 /// The `bool` in the result value indicates if we need to fall back to normal
 /// copying or not. False means we don't have to.
 #[inline]
-pub(super) fn write_fast_using_splice<R: FdReadable, S: AsRawFd + AsFd>(
+pub(super) fn write_fast_using_splice<R: FdReadable, S: AsRawFd + AsFd + Write>(
     handle: &InputHandle<R>,
-    write_fd: &S,
+    write_fd: &mut S,
 ) -> CatResult<bool> {
     if splice(&handle.reader, &write_fd, MAX_ROOTLESS_PIPE_SIZE).is_ok() {
         // fcntl improves throughput
         // todo: avoid fcntl overhead for small input, but don't fcntl inside of the loop
-        let _ = rustix::pipe::fcntl_setpipe_size(write_fd, MAX_ROOTLESS_PIPE_SIZE);
+        let _ = rustix::pipe::fcntl_setpipe_size(&mut *write_fd, MAX_ROOTLESS_PIPE_SIZE);
         loop {
             match splice(&handle.reader, &write_fd, MAX_ROOTLESS_PIPE_SIZE) {
                 Ok(1..) => {}
@@ -46,7 +44,9 @@ pub(super) fn write_fast_using_splice<R: FdReadable, S: AsRawFd + AsFd>(
                         // we can recover by copying the data that we have from the
                         // intermediate pipe to stdout using normal read/write. Then
                         // we tell the caller to fall back.
-                        copy_exact(&pipe_rd, write_fd, n)?;
+                        let mut drain = Vec::with_capacity(n); // bounded by pipe size
+                        pipe_rd.take(n as u64).read_to_end(&mut drain)?;
+                        write_fd.write_all(&drain)?;
                         return Ok(true);
                     }
                 }
@@ -57,24 +57,3 @@ pub(super) fn write_fast_using_splice<R: FdReadable, S: AsRawFd + AsFd>(
         Ok(true)
     }
 }
-
-/// Move exactly `num_bytes` bytes from `read_fd` to `write_fd`.
-///
-/// Panics if not enough bytes can be read.
-fn copy_exact(read_fd: &impl AsFd, write_fd: &impl AsFd, num_bytes: usize) -> std::io::Result<()> {
-    let mut left = num_bytes;
-    let mut buf = [0; BUF_SIZE];
-    while left > 0 {
-        let n = read(read_fd, &mut buf)?;
-        assert_ne!(n, 0, "unexpected end of pipe");
-        let mut written = 0;
-        while written < n {
-            match write(write_fd, &buf[written..n])? {
-                0 => unreachable!("fd should be writable"),
-                w => written += w,
-            }
-        }
-        left -= n;
-    }
-    Ok(())
-}

src/uu/cat/src/cat.rs

@@ -40,7 +40,6 @@ jiff = { workspace = true, features = [
   "tzdb-concatenated",
 ] }
 parse_datetime = { workspace = true }
-regex = { workspace = true }
 uucore = { workspace = true, features = ["parser", "i18n-datetime"] }
 
 [target.'cfg(unix)'.dependencies]