Changeset 3459 for trunk

Timestamp:

Jun 16, 2007, 11:37:57 PM (18 years ago)

Author:

bird

Message:

Workaroud for symlink bug in spawnve.

File:

• trunk/essentials/app-shells/bash/execute_cmd.c (modified) (3 diffs)

trunk/essentials/app-shells/bash/execute_cmd.c

@@ -3701 +3701 @@
 }
 
-#if !defined (HAVE_HASH_BANG_EXEC)
+#if !defined (HAVE_HASH_BANG_EXEC) || defined (__OS2__) /* OS2: see shell_execve. */
 /* If the operating system on which we're running does not handle
    the #! executable format, then help out.  SAMPLE is the text read
@@ -3757 +3757 @@
 
   args[larry] = (char *)NULL;
+
+#ifdef __OS2__
+  /*
+   * We've got a relaxed attitued to #!/bin/something 
+   * since /bin usually is somewhere else. See __spawnve.
+   */
+  {
+    struct stat s;
+    if (stat (execname, &s))
+      {
+        char *tmp = _getname (execname);
+        char *path = alloca (512); /* big buffer since the _searchenv interface is silly. */
+        _searchenv (execname, "PATH", path);
+        if (!path[0])
+         {
+            char *tmpbuf;
+            size_t len = strlen (tmp);
+            tmpbuf = alloca (len + 8);
+            memcpy (tmpbuf, tmp, len + 1);
+            _defext (tmpbuf, "exe");
+            if (tmpbuf[len])
+              _searchenv (tmpbuf, "PATH", path);
+          }
+        if (path[0])
+          execname = path;
+      }
+  }
+#endif
 
   return (shell_execve (execname, args, env));
@@ -3841 +3869 @@
   char sample[80];
   int sample_len;
+
+#ifdef __OS2__
+  /* 
+   * symlinked hash-bang scripts are currently broken,
+   * this is an attemt at fixing some of the damage.
+   */
+  static int been_here_already = 0;
+  struct stat s;
+  if (!lstat(command, &s) && S_ISLNK(s.st_mode) && been_here_already < 3)
+    {
+      READ_SAMPLE_BUF (command, sample, sample_len);
+      if (sample_len > 2 && sample[0] == '#' && sample[1] == '!')
+        {
+          been_here_already++;
+          return (execute_shell_script (sample, sample_len, command, args, env));
+        }
+    }
+#endif
 
   SETOSTYPE (0);                /* Some systems use for USG/POSIX semantics */