Merge branch 'main' into fix/ptx-tex-format-bug

Author: Misakait

.github/workflows/CICD.yml

@@ -782,6 +782,9 @@ jobs:
             # We also create a couple optional files pinky looks for
             touch /home/runner/.project
             echo "foo" > /home/runner/.plan
+            # add user with digital username for testing with issue #7787
+            echo 200:x:2000:2000::/home/200:/bin/bash | sudo tee -a /etc/passwd
+            echo 200:x:2000: | sudo tee -a /etc/group
             ;;
         esac
     - uses: taiki-e/install-action@v2
@@ -1156,6 +1159,9 @@ jobs:
             # We also create a couple optional files pinky looks for
             touch /home/runner/.project
             echo "foo" > /home/runner/.plan
+            # add user with digital username for testing with issue #7787
+            echo 200:x:2000:2000::/home/200:/bin/bash | sudo tee -a /etc/passwd
+            echo 200:x:2000: | sudo tee -a /etc/group
             ;;
         esac
 

src/uucore/src/lib/features/entries.rs

@@ -309,9 +309,17 @@ macro_rules! f {
         impl<'a> Locate<&'a str> for $st {
             fn locate(k: &'a str) -> IOResult<Self> {
                 let _guard = PW_LOCK.lock();
-                if let Ok(id) = k.parse::<$t>() {
-                    // SAFETY: We're holding PW_LOCK.
-                    unsafe {
+                // SAFETY: We're holding PW_LOCK.
+                unsafe {
+                    let cstring = CString::new(k)?;
+                    // try to get user or group with name matching the input with these tow lines:
+                    // f!(getpwnam, getpwuid, uid_t, Passwd);
+                    // f!(getgrnam, getgrgid, gid_t, Group);
+                    let data = $fnam(cstring.as_ptr());
+                    if !data.is_null() {
+                        return Ok($st::from_raw(ptr::read(data as *const _)));
+                    }
+                    if let Ok(id) = k.parse::<$t>() {
                         let data = $fid(id);
                         if !data.is_null() {
                             Ok($st::from_raw(ptr::read(data as *const _)))
@@ -321,17 +329,8 @@ macro_rules! f {
                                 format!("No such id: {id}"),
                             ))
                         }
-                    }
-                } else {
-                    // SAFETY: We're holding PW_LOCK.
-                    unsafe {
-                        let cstring = CString::new(k).unwrap();
-                        let data = $fnam(cstring.as_ptr());
-                        if !data.is_null() {
-                            Ok($st::from_raw(ptr::read(data as *const _)))
-                        } else {
-                            Err(IOError::new(ErrorKind::NotFound, format!("Not found: {k}")))
-                        }
+                    } else {
+                        Err(IOError::new(ErrorKind::NotFound, format!("Not found: {k}")))
                     }
                 }
             }

tests/by-util/test_id.rs

@@ -5,6 +5,7 @@
 
 // spell-checker:ignore (ToDO) coreutil
 
+use std::process::{Command, Stdio};
 use uutests::new_ucmd;
 use uutests::unwrap_or_return;
 use uutests::util::{TestScenario, check_coreutil_version, expected_result, is_ci, whoami};
@@ -475,3 +476,27 @@ fn test_id_pretty_print_password_record() {
         .fails()
         .stderr_contains("the argument '-p' cannot be used with '-P'");
 }
+
+/// This test requires user with username 200 on system
+#[test]
+#[cfg(unix)]
+fn test_id_digital_username() {
+    match Command::new("id")
+        .arg("200")
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .status()
+    {
+        Ok(ret) if ret.success() => {}
+        Ok(_) => {
+            println!("Test skipped; requires user with username 200 on system");
+            return;
+        }
+        Err(e) => {
+            println!("failed to run id command: {e}");
+            return;
+        }
+    }
+
+    new_ucmd!().arg("200").succeeds();
+}