diff mbox series

[1/2] Revert "posix: Add POSIX aliases to some spawn functions" (BZ 34437)

Message ID 20260831161028.3062421-2-adhemerval.zanella@linaro.org (mailing list archive)
State New
Delegated to: Andreas K. Hüttel
Headers
Series posix: Add POSIX posix_spawn_file_actions_add{,f}chdir |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Test passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Test passed

Commit Message

Adhemerval Zanella Netto Aug. 31, 2026, 4:09 p.m. UTC 
  This reverts commit 7594b4e5a75d41e891782aa7e3fb51924f6840cb.
---
 conform/data/spawn.h-data     |  4 ----
 posix/Makefile                |  1 -
 posix/spawn.h                 | 20 --------------------
 posix/tst-spawn-chdir-posix.c |  2 --
 posix/tst-spawn-chdir.c       | 19 +++----------------
 5 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 posix/tst-spawn-chdir-posix.c

Comments

Andreas K. Huettel Sept. 1, 2026, 12:53 p.m. UTC | #1 
Am Montag, 31. August 2026, 18:09:36 Mitteleuropäische Sommerzeit schrieb Adhemerval Zanella:
> This reverts commit 7594b4e5a75d41e891782aa7e3fb51924f6840cb.

Reviewed-by: Andreas K. Huettel <dilfridge@gentoo.org>

* is an exact revert
* affects only headers and tests, so backportable


> ---
>  conform/data/spawn.h-data     |  4 ----
>  posix/Makefile                |  1 -
>  posix/spawn.h                 | 20 --------------------
>  posix/tst-spawn-chdir-posix.c |  2 --
>  posix/tst-spawn-chdir.c       | 19 +++----------------
>  5 files changed, 3 insertions(+), 43 deletions(-)
>  delete mode 100644 posix/tst-spawn-chdir-posix.c
> 
> diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data
> index 1f332324c2..43aa9cb8ae 100644
> --- a/conform/data/spawn.h-data
> +++ b/conform/data/spawn.h-data
> @@ -29,10 +29,6 @@ function int posix_spawnattr_setpgroup (posix_spawnattr_t*, pid_t)
>  function int posix_spawnattr_setschedparam (posix_spawnattr_t*, const struct sched_param*)
>  function int posix_spawnattr_setschedpolicy (posix_spawnattr_t*, int)
>  function int posix_spawnattr_setsigmask (posix_spawnattr_t*, const sigset_t*)
> -#if defined XOPEN2K24 || defined POSIX2024
> -function int posix_spawn_file_actions_addchdir (posix_spawn_file_actions_t*, const char *)
> -function int posix_spawn_file_actions_addfchdir (posix_spawn_file_actions_t*, int)
> -#endif
>  function int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t*, int)
>  function int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t*, int, int)
>  function int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t*, int, const char *, int, mode_t)
> diff --git a/posix/Makefile b/posix/Makefile
> index ae26443ac9..b2fc897455 100644
> --- a/posix/Makefile
> +++ b/posix/Makefile
> @@ -317,7 +317,6 @@ tests := \
>    tst-rxspencer-no-utf8 \
>    tst-sched_getaffinity \
>    tst-spawn-chdir \
> -  tst-spawn-chdir-posix \
>    tst-spawn4 \
>    tst-spawn5 \
>    tst-spawn6 \
> diff --git a/posix/spawn.h b/posix/spawn.h
> index 0aabf5ebef..5e68752a66 100644
> --- a/posix/spawn.h
> +++ b/posix/spawn.h
> @@ -200,26 +200,6 @@ extern int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *
>  					     int __fd, int __newfd)
>       __THROW __nonnull ((1));
>  
> -#ifdef __USE_XOPEN2K24XSI
> -
> -/* Add an action changing the directory to PATH during spawn.  This
> -   affects the subsequent file actions.
> -   Alias of posix_spawn_file_actions_addchdir_np.  */
> -extern int __REDIRECT_NTH (posix_spawn_file_actions_addchdir,
> -                            (posix_spawn_file_actions_t * __restrict __actions,
> -                             const char *__restrict __path),
> -                            posix_spawn_file_actions_addchdir_np);
> -
> -/* Add an action changing the directory to FD during spawn.  This
> -   affects the subsequent file actions.  FD is not duplicated and must
> -   be open when the file action is executed.
> -   Alias of posix_spawn_file_actions_addfchdir_np.  */
> -extern int __REDIRECT_NTH (posix_spawn_file_actions_addfchdir,
> -                           (posix_spawn_file_actions_t *, int __fd),
> -                           posix_spawn_file_actions_addfchdir_np);
> -
> -#endif /* __USE_XOPEN2K24XSI */
> -
>  #ifdef __USE_MISC
>  /* Add an action changing the directory to PATH during spawn.  This
>     affects the subsequent file actions.  */
> diff --git a/posix/tst-spawn-chdir-posix.c b/posix/tst-spawn-chdir-posix.c
> deleted file mode 100644
> index 3f8d8952bb..0000000000
> --- a/posix/tst-spawn-chdir-posix.c
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -#define USE_POSIX_ALIASES
> -#include "tst-spawn-chdir.c"
> diff --git a/posix/tst-spawn-chdir.c b/posix/tst-spawn-chdir.c
> index 166f835492..a3478d61f6 100644
> --- a/posix/tst-spawn-chdir.c
> +++ b/posix/tst-spawn-chdir.c
> @@ -78,25 +78,12 @@ add_chdir (posix_spawn_file_actions_t *actions, const char *path,
>      {
>        TEST_COMPARE (posix_spawn_file_actions_addopen
>                      (actions, tmpfd, path, O_DIRECTORY | O_RDONLY, 0), 0);
> -
> -#ifdef USE_POSIX_ALIASES
> -      int ret = posix_spawn_file_actions_addfchdir (actions, tmpfd);
> -#else
> -      int ret = posix_spawn_file_actions_addfchdir_np (actions, tmpfd);
> -#endif
> -      TEST_COMPARE (ret, 0);
> -
> +      TEST_COMPARE (posix_spawn_file_actions_addfchdir_np
> +                    (actions, tmpfd), 0);
>        TEST_COMPARE (posix_spawn_file_actions_addclose (actions, tmpfd), 0);
>      }
>    else
> -    {
> -#ifdef USE_POSIX_ALIASES
> -      int ret = posix_spawn_file_actions_addchdir (actions, path);
> -#else
> -      int ret = posix_spawn_file_actions_addchdir_np (actions, path);
> -#endif
> -      TEST_COMPARE (ret, 0);
> -    }
> +    TEST_COMPARE (posix_spawn_file_actions_addchdir_np (actions, path), 0);
>  }
>  
>  static int
>
diff mbox series

Patch

diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data
index 1f332324c2..43aa9cb8ae 100644
--- a/conform/data/spawn.h-data
+++ b/conform/data/spawn.h-data
@@ -29,10 +29,6 @@  function int posix_spawnattr_setpgroup (posix_spawnattr_t*, pid_t)
 function int posix_spawnattr_setschedparam (posix_spawnattr_t*, const struct sched_param*)
 function int posix_spawnattr_setschedpolicy (posix_spawnattr_t*, int)
 function int posix_spawnattr_setsigmask (posix_spawnattr_t*, const sigset_t*)
-#if defined XOPEN2K24 || defined POSIX2024
-function int posix_spawn_file_actions_addchdir (posix_spawn_file_actions_t*, const char *)
-function int posix_spawn_file_actions_addfchdir (posix_spawn_file_actions_t*, int)
-#endif
 function int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t*, int)
 function int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t*, int, int)
 function int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t*, int, const char *, int, mode_t)
diff --git a/posix/Makefile b/posix/Makefile
index ae26443ac9..b2fc897455 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -317,7 +317,6 @@  tests := \
   tst-rxspencer-no-utf8 \
   tst-sched_getaffinity \
   tst-spawn-chdir \
-  tst-spawn-chdir-posix \
   tst-spawn4 \
   tst-spawn5 \
   tst-spawn6 \
diff --git a/posix/spawn.h b/posix/spawn.h
index 0aabf5ebef..5e68752a66 100644
--- a/posix/spawn.h
+++ b/posix/spawn.h
@@ -200,26 +200,6 @@  extern int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *
 					     int __fd, int __newfd)
      __THROW __nonnull ((1));
 
-#ifdef __USE_XOPEN2K24XSI
-
-/* Add an action changing the directory to PATH during spawn.  This
-   affects the subsequent file actions.
-   Alias of posix_spawn_file_actions_addchdir_np.  */
-extern int __REDIRECT_NTH (posix_spawn_file_actions_addchdir,
-                            (posix_spawn_file_actions_t * __restrict __actions,
-                             const char *__restrict __path),
-                            posix_spawn_file_actions_addchdir_np);
-
-/* Add an action changing the directory to FD during spawn.  This
-   affects the subsequent file actions.  FD is not duplicated and must
-   be open when the file action is executed.
-   Alias of posix_spawn_file_actions_addfchdir_np.  */
-extern int __REDIRECT_NTH (posix_spawn_file_actions_addfchdir,
-                           (posix_spawn_file_actions_t *, int __fd),
-                           posix_spawn_file_actions_addfchdir_np);
-
-#endif /* __USE_XOPEN2K24XSI */
-
 #ifdef __USE_MISC
 /* Add an action changing the directory to PATH during spawn.  This
    affects the subsequent file actions.  */
diff --git a/posix/tst-spawn-chdir-posix.c b/posix/tst-spawn-chdir-posix.c
deleted file mode 100644
index 3f8d8952bb..0000000000
--- a/posix/tst-spawn-chdir-posix.c
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#define USE_POSIX_ALIASES
-#include "tst-spawn-chdir.c"
diff --git a/posix/tst-spawn-chdir.c b/posix/tst-spawn-chdir.c
index 166f835492..a3478d61f6 100644
--- a/posix/tst-spawn-chdir.c
+++ b/posix/tst-spawn-chdir.c
@@ -78,25 +78,12 @@  add_chdir (posix_spawn_file_actions_t *actions, const char *path,
     {
       TEST_COMPARE (posix_spawn_file_actions_addopen
                     (actions, tmpfd, path, O_DIRECTORY | O_RDONLY, 0), 0);
-
-#ifdef USE_POSIX_ALIASES
-      int ret = posix_spawn_file_actions_addfchdir (actions, tmpfd);
-#else
-      int ret = posix_spawn_file_actions_addfchdir_np (actions, tmpfd);
-#endif
-      TEST_COMPARE (ret, 0);
-
+      TEST_COMPARE (posix_spawn_file_actions_addfchdir_np
+                    (actions, tmpfd), 0);
       TEST_COMPARE (posix_spawn_file_actions_addclose (actions, tmpfd), 0);
     }
   else
-    {
-#ifdef USE_POSIX_ALIASES
-      int ret = posix_spawn_file_actions_addchdir (actions, path);
-#else
-      int ret = posix_spawn_file_actions_addchdir_np (actions, path);
-#endif
-      TEST_COMPARE (ret, 0);
-    }
+    TEST_COMPARE (posix_spawn_file_actions_addchdir_np (actions, path), 0);
 }
 
 static int