Merge branch 'main' into sort_sort-h-thousands-sep.sh

Author: sylvestre

.github/workflows/android.yml

@@ -39,7 +39,7 @@ jobs:
         ram: [4096]
         api-level: [28]
         target: [google_apis_playstore]
-        arch: [x86, x86_64] # , arm64-v8a
+        arch: [x86_64] # ,x86 ,arm64-v8a
     runs-on: ${{ matrix.os }}
     env:
       EMULATOR_RAM_SIZE: ${{ matrix.ram }}

src/uu/mkfifo/locales/en-US.ftl

@@ -11,3 +11,4 @@ mkfifo-error-invalid-mode = invalid mode: { $error }
 mkfifo-error-missing-operand = missing operand
 mkfifo-error-cannot-create-fifo = cannot create fifo { $path }: File exists
 mkfifo-error-cannot-set-permissions = cannot set permissions on { $path }: { $error }
+mkfifo-error-non-file-permission = mode must specify only file permission bits

src/uu/mkfifo/locales/fr-FR.ftl

@@ -11,3 +11,4 @@ mkfifo-error-invalid-mode = mode invalide : { $error }
 mkfifo-error-missing-operand = opérande manquant
 mkfifo-error-cannot-create-fifo = impossible de créer le fifo { $path } : Le fichier existe
 mkfifo-error-cannot-set-permissions = impossible de définir les permissions sur { $path } : { $error }
+mkfifo-error-non-file-permission = le mode ne doit spécifier que des bits de permission de fichier

src/uu/mkfifo/src/mkfifo.rs

@@ -28,6 +28,15 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let mode = calculate_mode(matches.get_one::<String>(options::MODE))
         .map_err(|e| USimpleError::new(1, translate!("mkfifo-error-invalid-mode", "error" => e)))?;
 
+    // Check if mode contains special bits
+    let non_file_permission_bits = 0o7000; // setuid, setgid, sticky bits
+    if mode & non_file_permission_bits != 0 {
+        return Err(USimpleError::new(
+            1,
+            translate!("mkfifo-error-non-file-permission"),
+        ));
+    }
+
     let fifos: Vec<String> = match matches.get_many::<String>(options::FIFO) {
         Some(v) => v.cloned().collect(),
         None => {

src/uu/unexpand/src/unexpand.rs

@@ -303,8 +303,8 @@ fn next_tabstop(tab_config: &TabConfig, col: usize) -> Option<usize> {
     }
 
     if tabstops.len() == 1
-        && tab_config.increment_size.is_none()
-        && tab_config.extend_size.is_none()
+        && !matches!(tab_config.increment_size, Some(n) if n > 0)
+        && !matches!(tab_config.extend_size, Some(n) if n > 0)
     {
         // Simple case: single tab stop, repeat at that interval
         Some(tabstops[0] - col % tabstops[0])

tests/by-util/test_mkfifo.rs

@@ -43,6 +43,22 @@ fn test_create_one_fifo_with_invalid_mode() {
         .stderr_contains("invalid mode");
 }
 
+#[test]
+fn test_create_one_fifo_with_non_file_permission_mode() {
+    new_ucmd!()
+        .arg("abcd")
+        .arg("-m")
+        .arg("1777")
+        .fails()
+        .stderr_is("mkfifo: mode must specify only file permission bits\n");
+    new_ucmd!()
+        .arg("abcd")
+        .arg("-m")
+        .arg("1999")
+        .fails()
+        .stderr_contains("invalid mode");
+}
+
 #[test]
 fn test_create_multiple_fifos() {
     new_ucmd!()

tests/by-util/test_unexpand.rs

@@ -329,3 +329,31 @@ fn test_blanks_ext2() {
         .succeeds()
         .stdout_is("\t\t");
 }
+
+#[test]
+fn test_extended_tabstop_syntax() {
+    let test_cases = [
+        // Standalone /N: tabs at multiples of N
+        ("-t /9", "         ", "\t"),            // 9 spaces -> 1 tab
+        ("-t /9", "                  ", "\t\t"), // 18 spaces -> 2 tabs
+        // Standalone +N: tabs at multiples of N
+        ("-t +6", "      ", "\t"),         // 6 spaces -> 1 tab
+        ("-t +6", "            ", "\t\t"), // 12 spaces -> 2 tabs
+        // 3,/0 and 3,+0 should behave like just 3
+        ("-t 3,/0", "          ", "\t\t\t "), // 10 spaces -> 3 tabs + 1 space
+        ("-t 3,+0", "          ", "\t\t\t "), // 10 spaces -> 3 tabs + 1 space
+        ("-t 3", "          ", "\t\t\t "),    // 10 spaces -> 3 tabs + 1 space
+        // 3,/0 with text
+        ("-t 3,/0", "   test", "\ttest"), // 3 spaces + text -> 1 tab + text
+        // 3,+6 means tab stops at 3, 9, 15, 21, ...
+        ("-t 3,+6", "                    ", "\t\t\t     "), // 20 spaces -> 3 tabs + 5 spaces
+    ];
+
+    for (args, input, expected) in test_cases {
+        new_ucmd!()
+            .args(&args.split_whitespace().collect::<Vec<_>>())
+            .pipe_in(input)
+            .succeeds()
+            .stdout_is(expected);
+    }
+}