Index: misc/getargs.c
===================================================================
--- misc/getargs.c	(revision 28759)
+++ misc/getargs.c	(working copy)
@@ -192,8 +192,19 @@
    ignorespace = 0;
    doexpand = expand_wildcards;
 
+   if (__argv && _environ)
+   {
+      *argv = __argv;
+      *env = _environ;
+      *argc = __argc;
+      return;
+   }
+
+   __argc = 0;
+
    len = strlen(_acmdln);
 
+
    while (_acmdln[i])
    {
       if (_acmdln[i] == '"')
@@ -262,6 +273,16 @@
    ignorespace = 0;
    doexpand = expand_wildcards;
 
+   if (__wargv && __winitenv)
+   {
+      *wargv = __wargv;
+      *wenv = __winitenv;
+      *argc = __argc;
+      return;
+   }
+
+   __argc = 0;
+
    len = wcslen(_wcmdln);
 
    while (_wcmdln[i])