Changeset 57 in kBuild

Timestamp:

Nov 23, 2003 10:38:39 PM (21 years ago)

Author:

bird

Message:

Config & adjustments for OS/2 LIBC. dllshell.

Location:

trunk/src/gmake

Files:

• Makefile.OS2.libc (added)
• config.h.OS2.libc (added)
• dir.c (modified) (1 diff)
• function.c (modified) (1 diff)
• job.c (modified) (17 diffs)
• job.h (modified) (2 diffs)
• main.c (modified) (1 diff)

trunk/src/gmake/dir.c ¶

@@ -1197 +1197 @@
   gl->gl_closedir = ansi_free;
   gl->gl_stat = local_stat;
+#ifdef __EMX__ /* The FreeBSD implemenation actually uses gl_lstat!! */
+  gl->gl_lstat = local_stat;
+#endif
   /* We don't bother setting gl_lstat, since glob never calls it.
      The slot is only there for compatibility with 4.4 BSD.  */

trunk/src/gmake/function.c ¶

@@ -1500 +1500 @@
   CLOSE_ON_EXEC(pipedes[0]);
   /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
-  pid = child_execute_job (0, pipedes[1], command_argv, envp);
+  pid = child_execute_job (0, pipedes[1], command_argv, envp, NULL);
   if (pid < 0)
     perror_with_name (error_prefix, "spawn");

trunk/src/gmake/job.c ¶

@@ -31 +31 @@
 #include <string.h>
 
+#ifdef MAKE_DLLSHELL
+#include <dlfcn.h>
+#endif
+
 /* Default shell to use.  */
 #ifdef WINDOWS32
@@ -55 +59 @@
 #elif defined (__EMX__)
 
-const char *default_shell = "/bin/sh";
+char *default_shell = "sh.exe";
 int batch_mode_shell = 0;
 
@@ -201 +205 @@
 #ifdef VMS
 static void vmsWaitForChildren PARAMS ((int *));
+#endif
+#ifdef MAKE_DLLSHELL
+static int spawn_command PARAMS ((char **argv, char **envp, struct child *child));
 #endif
 
@@ -434 +441 @@
 static unsigned int dead_children = 0;
 
-#ifndef __EMX__ /* Don't use SIGCHLD handler on OS/2. */
 RETSIGTYPE
 child_handler (int sig)
@@ -446 +452 @@
     }
 
+#ifdef __EMX__
+  signal(SIGCHLD, SIG_DFL); /* The signal handler must called only once! ????*/
+#endif
+
   DB (DB_JOBS, (_("Got a SIGCHLD; %u unreaped children.\n"), dead_children));
 }
-#endif  /* !__EMX__ */
 
 extern int shell_function_pid, shell_function_completed;
@@ -489 +498 @@
       int child_failed;
       int any_remote, any_local;
+#ifdef MAKE_DLLSHELL
+      struct child *dllshelled_child = 0;
+#endif
 
       if (err && block)
@@ -523 +535 @@
           any_remote |= c->remote;
           any_local |= ! c->remote;
+#ifdef MAKE_DLLSHELL
+          if (c->dllshell_done)
+            dllshelled_child = c;
+#endif
           DB (DB_JOBS, (_("Live child 0x%08lx (%s) PID %ld %s\n"),
                         (unsigned long int) c, c->file->name,
@@ -549 +565 @@
         {
           /* No remote children.  Check for local children.  */
+#ifdef MAKE_DLLSHELL
+          if (dllshelled_child)
+            {
+              pid = dllshelled_child->pid;
+              status = (WAIT_T)dllshelled_child->status;
+            }
+          else
+#endif
 #if !defined(__MSDOS__) && !defined(_AMIGA) && !defined(WINDOWS32)
           if (any_local)
@@ -579 +603 @@
               coredump = WCOREDUMP (status);
 
-#ifdef __EMX__
+#if 0 /*def __EMX__*/
               /* the SIGCHLD handler must not be used on OS/2 because, unlike
                  on UNIX systems, it had to call wait() itself.  Therefore
@@ -899 +923 @@
 
 #ifdef MAKE_JOBSERVER
-# ifdef __EMX__
-/* Never install the SIGCHLD handler for EMX!!! */
-#  define set_child_handler_action_flags(x)
-# else
 /* Set the child handler action flags to FLAGS.  */
 static void
@@ -918 +938 @@
 #endif
 }
-#endif  /* !__EMX__ */
 #endif
 
@@ -1204 +1223 @@
 
       /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
-      child->pid = child_execute_job (child->good_stdin ? 0 : bad_stdin, 1,
-                                      argv, child->environment);
+      child_execute_job (child->good_stdin ? 0 : bad_stdin, 1,
+                         argv, child->environment, child);
       if (child->pid < 0)
         {
@@ -1645 +1664 @@
         got_token = read (job_rfd, &token, 1);
         saved_errno = errno;
+#ifdef __EMX__
+        signal(SIGCHLD, SIG_DFL); /* The child handler must be turned off here. */
+#endif
         set_child_handler_action_flags (SA_RESTART);
 
@@ -2326 +2348 @@
 /* EMX: Start a child process. This function returns the new pid.  */
 # if defined __MSDOS__ ||  defined __EMX__
+/* The child argument can be NULL (that's why we return the pid), if it is
+   and the shell is a dllshell:// a child structure is created and inserted
+   into the child list so reap_children can do its job.
+
+   BTW. the name of this function in this port is very misleading, spawn_job
+   would perhaps be more appropriate. */
+
 int
-child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp)
+child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp,
+                   struct child *child)
 {
   int pid;
@@ -2360 +2390 @@
     CLOSE_ON_EXEC (stdout_fd);
 
+#ifdef MAKE_DLLSHELL
+  pid = spawn_command(argv, envp, child);
+#else
   /* Run the command.  */
   pid = exec_command (argv, envp);
+#endif
 
   /* Restore stdout/stdin of the parent process.  */
@@ -2368 +2402 @@
   if (stdout_fd != 1 && dup2 (save_stdout, 1) != 1)
     fatal (NILF, _("restoring of stdout failed\n"));
+
+  /* Cleanup handles */
+  if (stdin_fd != 0)
+    close (save_stdin);
+  if (stdout_fd != 1)
+    close (save_stdout);
 
   return pid;
@@ -2396 +2436 @@
 #endif /* !VMS */
 #endif /* !WINDOWS32 */
+
+
+#ifdef MAKE_DLLSHELL
+/* This is called when all pipes and such are configured for the
+   child process. The child argument may be null, see child_execute_job. */
+static int spawn_command (char **argv, char **envp, struct child *c)
+{
+  /* Now let's see if there is a DLLSHELL specifier in the
+     first argument. */
+  if (!strncmp(argv[0], "dllshell://", 11))
+    {
+      static void *cur_dll;             /* current loaded dll. */
+      static char *cur_dllspec;         /* dllshell without shell arg. */
+      /* pointer to the entrypoint. */
+      static pid_t (*cur_spawn) PARAMS ((char **argv, char **envp, int *status, char *done));
+
+      /* dllshell://<dllname>!<exec>[!<realshell>] */
+      char *name, *name_end, *symbol, *symbol_end;
+      int   len_basespec;
+      int   insert_child = 0;
+
+      /* parse it */
+      name = argv[0] + 11;
+      name_end = strchr (name, '!');
+      if (!name_end)
+        fatal (NILF, _("%s : malformed specifier!\n"), argv[0]);
+      symbol = name_end + 1;
+      symbol_end = strchr (symbol, '!');
+      if (symbol == symbol_end)
+        fatal (NILF, _("%s : malformed specifier!\n"), argv[0]);
+      if (symbol_end)
+        symbol_end = strchr (symbol, 0);
+      len_basespec = symbol_end - name;
+
+      /* need loading? */
+      if (   !cur_dllspec
+          || strncmp (name, cur_dllspec, len_basespec)
+          || argv[len_basespec])
+        {
+          if (cur_dll)
+            {
+              dlclose (cur_dll);
+              free (cur_dllspec);
+            }
+          cur_dllspec = strdup (name);
+          cur_dllspec[len_basespec] = '\0';
+          cur_dllspec[name_end - name] = '\0';
+          cur_dll = dlopen (cur_dllspec, RTLD_LOCAL);
+          if (!cur_dll)
+            fatal (NILF, _("%s : failed to load! dlerror: '%s'\n"), argv[0], dlerror());
+          cur_dllspec[name_end - name] = '!';
+          cur_spawn = dlsym (cur_dll, cur_dllspec + (symbol - name));
+          if (!cur_spawn)
+            fatal (NILF, _("%s : failed to find symbol! dlerror: %s\n"), argv[0], dlerror());
+        }
+
+      /* make child struct? */
+      if (!c)
+        {
+          c = (struct child *) xmalloc (sizeof (struct child));
+          bzero ((char *)c, sizeof (struct child));
+          insert_child = 1;
+        }
+
+      /* call it. return value is 0 on succes, -1 on failure. */
+      c->pid = cur_spawn (argv, envp, &c->status, &c->dllshell_done);
+      DB (DB_JOBS, (_("dllshell pid=%x"), c->pid));
+
+      if (insert_child && c->pid > 0)
+        {
+          c->next = children;
+          DB (DB_JOBS, (_("Putting child 0x%08lx (-) PID %ld on the chain.\n"),
+                        (unsigned long int) c, (long) c->pid));
+          children = c;
+          /* One more job slot is in use.  */
+          ++job_slots_used;
+        }
+    }
+  else
+    {
+      /* Run the command.  */
+#ifdef __EMX__
+      c->pid =
+        exec_command (argv, envp);
+#else
+# error MAKE_DLLSHELL is not ported to your platform yet.
+#endif
+      DB (DB_JOBS, (_("spawn pid=%x"), c->pid));
+    }
+
+  return c->pid;
+}
+#endif /* MAKE_DLLSHELL */
 
 

trunk/src/gmake/job.h ¶

@@ -58 +58 @@
 #endif
     char *sh_batch_file;        /* Script file for shell commands */
+#ifdef MAKE_DLLSHELL
+    int status;                 /* Status of the job.
+                                   Another thread might set this. */
+    char dllshell_done;         /* Nonzero if executed thru a dll shell.
+                                   Another thread might set this. */
+#endif
     unsigned int remote:1;      /* Nonzero if executing remotely.  */
 
@@ -75 +81 @@
 #ifdef VMS
 extern int child_execute_job PARAMS ((char *argv, struct child *child));
-#elif defined(__EMX__)
-extern int child_execute_job PARAMS ((int stdin_fd, int stdout_fd, char **argv, char **envp));
+#elif defined(__EMX__) || defined (MAKE_DLLSHELL)
+extern int child_execute_job PARAMS ((int stdin_fd, int stdout_fd, char **argv, char **envp, struct child *child));
 #else
 extern void child_execute_job PARAMS ((int stdin_fd, int stdout_fd, char **argv, char **envp));

trunk/src/gmake/main.c ¶

@@ -1916 +1916 @@
             int pid;
             int status;
-            pid = child_execute_job(0, 1, nargv, environ);
+            pid = child_execute_job(0, 1, nargv, environ, NULL);
 
             /* is this loop really necessary? */