Update copyright years.

[thirdparty/gcc.git] / libgfortran / intrinsics / execute_command_line.c

diff --git a/libgfortran/intrinsics/execute_command_line.c b/libgfortran/intrinsics/execute_command_line.c
index 2ef2324b24392fe4213c96ce22b262b9f93037c6..9bf009e0f620daa4ff62b0f8be3a34b9f6fbab01 100644 (file)
--- a/libgfortran/intrinsics/execute_command_line.c
+++ b/libgfortran/intrinsics/execute_command_line.c
@@ -1,5 +1,5 @@
 /* Implementation of the EXECUTE_COMMAND_LINE intrinsic.
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 Free Software Foundation, Inc.
    Contributed by François-Xavier Coudert.
 
 This file is part of the GNU Fortran runtime library (libgfortran).
@@ -34,7 +34,15 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #endif
 #ifdef HAVE_POSIX_SPAWN
 #include <spawn.h>
+# ifdef __APPLE__
+#  include <crt_externs.h>
+#  define environ (*_NSGetEnviron ())
+# else
 extern char **environ;
+# endif
+#endif
+#if defined(HAVE_POSIX_SPAWN) || defined(HAVE_FORK)
+#include <signal.h>
 #endif
 
 enum { EXEC_SYNCHRONOUS = -2, EXEC_NOERROR = 0, EXEC_SYSTEMFAILED,
@@ -62,6 +70,14 @@ set_cmdstat (int *cmdstat, int value)
 }
 
 
+#if defined(HAVE_WAITPID) && defined(HAVE_SIGACTION)
+static void
+sigchld_handler (int signum __attribute__((unused)))
+{
+  while (waitpid ((pid_t)(-1), NULL, WNOHANG) > 0) {}
+}
+#endif
+
 static void
 execute_command_line (const char *command, bool wait, int *exitstat,
                      int *cmdstat, char *cmdmsg,
@@ -82,6 +98,20 @@ execute_command_line (const char *command, bool wait, int *exitstat,
 
       set_cmdstat (cmdstat, EXEC_NOERROR);
 
+#if defined(HAVE_SIGACTION) && defined(HAVE_WAITPID)
+      static bool sig_init_saved;
+      bool sig_init = __atomic_load_n (&sig_init_saved, __ATOMIC_RELAXED);
+      if (!sig_init)
+       {
+         struct sigaction sa;
+         sa.sa_handler = &sigchld_handler;
+         sigemptyset(&sa.sa_mask);
+         sa.sa_flags = SA_RESTART | SA_NOCLDSTOP;
+         sigaction(SIGCHLD, &sa, 0);
+         __atomic_store_n (&sig_init_saved, true, __ATOMIC_RELAXED);
+       }
+#endif
+
 #ifdef HAVE_POSIX_SPAWN
       const char * const argv[] = {"sh", "-c", cmd, NULL};
       if (posix_spawn (&pid, "/bin/sh", NULL, NULL,
@@ -114,6 +144,11 @@ execute_command_line (const char *command, bool wait, int *exitstat,
 #if defined(WEXITSTATUS) && defined(WIFEXITED)
               || (WIFEXITED(res) && WEXITSTATUS(res) == 127)
               || (WIFEXITED(res) && WEXITSTATUS(res) == 126)
+#endif
+#ifdef __MINGW32__
+                 /* cmd.exe sets the errorlevel to 9009,
+                    if the command could not be executed.  */
+               || res == 9009
 #endif
               )
        /* Shell return codes 126 and 127 mean that the command line could
@@ -157,6 +192,8 @@ execute_command_line_i4 (const char *command, GFC_LOGICAL_4 *wait,
   bool w = wait ? *wait : true;
   int estat, estat_initial, cstat;
 
+  estat_initial = 0; /* Avoid nuisance warning if not initialized.  */
+
   if (exitstat)
     estat_initial = estat = *exitstat;
 
@@ -186,6 +223,8 @@ execute_command_line_i8 (const char *command, GFC_LOGICAL_8 *wait,
   bool w = wait ? *wait : true;
   int estat, estat_initial, cstat;
 
+  estat_initial = 0; /* Avoid nuisance warning if not initialized.  */
+
   if (exitstat)
     estat_initial = estat = *exitstat;