Changeset 3859 for branches

Timestamp:

Apr 14, 2014, 4:19:42 AM (11 years ago)

Author:

bird

Message:

libc-0.6: system() and popen() should use the same shells, preferablly /bin/sh when available (see unix spec). arg[0] shouldn't have a path, according to unix tradition (should be 'sh' to be more precise). Introduced a backend API for finding the desired shell and figure arguments. Fixes #287.

Location:

branches/libc-0.6/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• src/lib/io (modified) (1 prop)
• src/lib/io/popen.c (modified) (3 diffs)
• src/lib/libc.def (modified) (1 diff)
• src/lib/process (modified) (1 prop)
• src/lib/process/system.c (modified) (1 diff)
• src/lib/sys/b_processGetDefaultShell.c (copied) (copied from trunk/libc/src/kNIX/b_processGetDefaultShell.c ) (1 diff)

branches/libc-0.6/src/emx/include/InnoTekLIBC/backend.h

@@ -1042 +1042 @@
 /** When this flag is set, the exec / spawn backend will handle PC batch scripts. */
 extern int __libc_Back_gfProcessHandlePCBatchScripts;
+
+/**
+ * Gets the default shell for functions like system() and popen().
+ *
+ * @returns 0 on success, negative error number on failure.
+ * @param   pszShell        Where to put the path to the shell.
+ * @param   cbShell         The size of the buffer @a pszShell points to.
+ * @param   poffShellArg    Where to return the offset into @a pszShell of the
+ *                          first argument.  The system() and popen() calls has
+ *                          traditionally not included the path to /bin/sh.
+ * @param   pszCmdLineOpt   Where to put the shell option for specifying a
+ *                          command line it should execute.
+ * @param   cbCmdLineOpt    The size of the buffer @a pszCmdLineOpt points to.
+ */
+int __libc_Back_processGetDefaultShell(char *pszShell, size_t cbShell, size_t *poffShellArg,
+                                       char *pszCmdLineOpt, size_t cbCmdLineOpt);
 
 /** @} */

branches/libc-0.6/src/emx/src/lib/io/popen.c

@@ -10 +10 @@
 #include <fcntl.h>
 #include <errno.h>
+#include <InnotekLIBC/backend.h>
 
 static void restore (int org_handle, int org_private, int handle)
@@ -27 +28 @@
   int i, org_handle, org_private;
   FILE *f;
-  const char *sh, *base, *opt;
+  char szShell[260];
+  size_t offShellArg;
+  char szCmdLineOpt[8];
+  int rc;
 
   fcntl (pipe_local, F_SETFD, FD_CLOEXEC);
@@ -56 +60 @@
       return NULL;
     }
-  sh = getenv ("EMXSHELL");
-  if (sh == NULL)
-    sh = getenv ("COMSPEC");
-  if (sh == NULL)
+  rc = __libc_Back_processGetDefaultShell (&szShell[0], sizeof(szShell), &offShellArg, &szCmdLineOpt[0], sizeof(szCmdLineOpt));
+  if (rc != 0)
     {
       fclose (f);
       restore (org_handle, org_private, handle);
-      errno = ENOENT;
+      errno = -rc;
       return NULL;
     }
-  base = _getname (sh);
-  if (stricmp (base, "cmd.exe") == 0 || stricmp (base, "4os2.exe") == 0)
-    opt = "/c";
-  else
-    opt = "-c";
-  i = spawnlp (P_NOWAIT, sh, sh, opt, command, (char *)0);
+  i = spawnlp (P_NOWAIT, szShell, &szShell[offShellArg], szCmdLineOpt, command, (char *)0);
   if (i == -1)
     {

branches/libc-0.6/src/emx/src/lib/libc.def

@@ -1966 +1966 @@
     "___libc_Back_fsFileOwnerSetFH" @1962
     "___libc_Back_fsSymlinkOwnerSet" @1963
-
+    "___libc_Back_processGetDefaultShell" @1964
+    

branches/libc-0.6/src/emx/src/lib/process/system.c

@@ -1 @@
-/* system.c (emx+gcc) -- Copyright (c) 1990-1995 by Eberhard Mattes */
+/* $Id: b_processSetResourceLimit.c 3770 2012-03-15 20:02:46Z bird $ */
+/** @file
+ * kNIX - get default shell for system() and popen().
+ *
+ * @copyright   Copyright (C) 2014 knut st. osmundsen <bird-klibc-spam-xiv@anduin.net>
+ * @licenses    MIT, BSD2, BSD3, BSD4, LGPLv2.1, LGPLv3.
+ */
 
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_PROCESS
 #include "libc-alias.h"
 #include <stdlib.h>
-#include <string.h>
-#include <process.h>
+
 #include <io.h>
 #include <errno.h>
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_PROCESS
-#include <InnoTekLIBC/logstrict.h>
+#include <process.h>
+#include <unistd.h>
+#include <InnotekLIBC/backend.h>
+#include <InnotekLIBC/logstrict.h>
 
-int _STD(system)(const char *name)
+
+int _STD(system)(const char *pszCmdLine)
 {
-    LIBCLOG_ENTER("name=%s\n", name);
-    int rc;
-    const char *sh, *base, *opt;
-
-    sh = getenv("EMXSHELL");
-    if (sh == NULL)
-        sh = getenv("COMSPEC");
-    if (sh == NULL)
-        sh = getenv("OS2_SHELL");
-    if (sh == NULL)
-        sh = getenv("SHELL");
-    if (sh == NULL)
+    LIBCLOG_ENTER("pszCmdLine=%s\n", pszCmdLine);
+    char szCmdLineOpt[8];
+    char szShell[260];
+    size_t offShellArg;
+    int rc = __libc_Back_processGetDefaultShell(szShell, sizeof(szShell), &offShellArg, szCmdLineOpt, sizeof(szCmdLineOpt));
+    if (rc == 0)
     {
-        errno = ENOENT;
-        LIBCLOG_ERROR_RETURN(-1, "ret -1 - no shell\n");
+        LIBCLOG_MSG("using shell: %s\n", pszCmdLine);
+        if (pszCmdLine == 0)
+            rc = access(szShell, F_OK) == 0;
+        else if (*pszCmdLine)
+            rc = spawnlp(P_WAIT, szShell, &szShell[offShellArg], (void *)NULL);
+        else
+            rc = spawnlp(P_WAIT, szShell, &szShell[offShellArg], szCmdLineOpt, pszCmdLine, (void *)NULL);
     }
-    LIBCLOG_MSG("using shell: %s\n", sh);
-    if (name == NULL)   /* Check for command interpreter */
-    {
-        LIBCLOG_MSG("check shell access\n");
-        rc = access(sh, 0) == 0;
-        LIBCLOG_RETURN_INT(rc);
-    }
-    if (*name == 0)
-        rc = spawnlp(P_WAIT, sh, sh, (char *)0);
     else
     {
-        base = _getname(sh);
-        if (    stricmp(base, "cmd.exe") == 0
-            ||  stricmp(base, "4os2.exe") == 0
-            ||  stricmp(base, "command.com") == 0
-            ||  stricmp(base, "4dos.com") == 0)
-            opt = "/c";
-        else
-            opt = "-c";
-        rc = spawnlp(P_WAIT, sh, sh, opt, name, (char *)0);
+        errno = -rc;
+        rc = -1;
     }
     LIBCLOG_RETURN_INT(rc);
 }
+

branches/libc-0.6/src/emx/src/lib/sys/b_processGetDefaultShell.c

@@ -11 +11 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "kNIX.h"
+#include "libc-alias.h"
+#include "syscalls.h"
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_PROCESS
-#include <klibc/logstrict.h>
-#include <klibc/initterm.h>
+#include <InnotekLIBC/logstrict.h>
+#include <InnotekLIBC/libc.h>
+#include <InnotekLIBC/backend.h>