Changeset 22000 for trunk/src

Timestamp:

May 25, 2012, 1:14:22 PM (13 years ago)

Author:

dmik

Message:

kernel32: Cut out hidden kLIBC arguments added by spawn().

These arguments are not intended to be seen by the application and
should not appear in GetCommandLine().

This is a temporary solution (see svn.netlabs.org/libc/ticket/260 for details).

File:

• trunk/src/kernel32/wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -24 +24 @@
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef __KLIBC__
+#include <klibc/startup.h>
+#endif
 
 #include <unicode.h>
@@ -1663 +1667 @@
         {
             psz2 = pib_pchcmd + strlen(pib_pchcmd) + 1;
+
+#ifdef __KLIBC__
+            // kLIBC spawn() detects if the process it starts is a kLIBC process
+            // and uses special hidden command line arguments to pass additional
+            // info to it which are then removed before passing arguments to
+            // main(). Since we don't have global argc/argv pointers in kLIBC,
+            // we can't access them here and have to cut out these hidden args
+            // Yes, it's implementation dependent -- needs to be changed when
+            // kLIBC 0.7 (which contains glibal argc/argv) comes out.
+            bool isKLIBC = strcmp(psz2, __KLIBC_ARG_SIGNATURE) == 0;
+            if (isKLIBC)
+                psz2 += strlen(psz2) + 1;
+#endif
             while (*psz2 != '\0')
             {
+#ifdef __KLIBC__
+                // if the first byte is a kLIBC flag, skip it
+                if (isKLIBC)
+                    psz2++;
+#endif
                 register int cchTmp = strlen(psz2) + 1; /* + 1 is for terminator (psz). */
                 *psz++ = ' ';           /* add space */