Changeset 3270 for trunk

Timestamp:

May 1, 2007, 6:40:49 PM (18 years ago)

Author:

bird

Message:

translate /bin/sh and a few other standard things to /@unixroot and PATH searches.

File:

• trunk/essentials/app-shells/bash/execute_cmd.c (modified) (1 diff)

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

@@ -3845 +3845 @@
   execve (command, args, env);
   i = errno;                    /* error from execve() */
+
+#ifdef __OS2__
+  /* A lot of scripts references some core /bin/ programs, like for 
+     instance the bash testcases. So, to make life easier, we map 
+     a small set of these to @unixroot and or the PATH to simplify 
+     porting. */
+  if (!strncmp(command, "/bin/", sizeof("/bin/") - 1))
+    {
+      char *name = command + sizeof("/bin/") - 1;
+      int search_path = 1;
+      if (!strcmp (name, "sh")
+       || !strcmp (name, "sh.exe")
+       || !strcmp (name, "bash")
+       || !strcmp (name, "bash.exe")
+       || !strcmp (name, "ash")
+       || !strcmp (name, "ash.exe")
+       || !strcmp (name, "ls")
+       || !strcmp (name, "ls.exe")
+       || !strcmp (name, "cat")
+       || !strcmp (name, "cat.exe")
+       || !strcmp (name, "mkdir")
+       || !strcmp (name, "mkdir.exe")
+       || !strcmp (name, "expr")
+       || !strcmp (name, "expr.exe")
+       || !strcmp (name, "pwd")
+       || !strcmp (name, "pwd.exe")
+       || !strcmp (name, "tr")
+       || !strcmp (name, "tr.exe")
+       || (search_path = 0)
+       || !strcmp (name, "sort")
+       || !strcmp (name, "sort.exe")
+       || !strcmp (name, "cp")
+       || !strcmp (name, "cp.exe")
+       || !strcmp (name, "rm")
+       || !strcmp (name, "rm.exe")
+       || !strcmp (name, "unlink")
+       || !strcmp (name, "unlink.exe")
+       || !strcmp (name, "mv")
+       || !strcmp (name, "mv.exe")
+       || !strcmp (name, "rmdir")
+       || !strcmp (name, "rmdir.exe")
+      )
+        {
+          strcat (strcpy (sample, "/@unixroot"), command);
+          execve (sample, args, env);
+          if (search_path)
+            {
+              strcpy (sample, name);
+              if (!strchr (name, '.'))
+                strcat (sample, ".exe");
+              execvpe (sample, args, env);
+            }
+        }
+    }
+#endif
+
   SETOSTYPE (1);