Index: /trunk/src/lib/Makefile.kmk
===================================================================
--- /trunk/src/lib/Makefile.kmk	(revision 647)
+++ /trunk/src/lib/Makefile.kmk	(revision 648)
@@ -37,4 +37,11 @@
 
 
+ifeq ($(filter-out win nt win32 win64,$(BUILD_TARGET)),)
+LIBRARIES += kWinStartup
+kWinStartup_TEMPLATE = LIB
+kWinStartup_SOURCES = $(PATH_CURRENT)/startuphacks-win.c
+kWinStartup_NOINST = 1
+endif
+
 include $(PATH_KBUILD)/footer.kmk
 
Index: /trunk/src/lib/startuphacks-win.c
===================================================================
--- /trunk/src/lib/startuphacks-win.c	(revision 648)
+++ /trunk/src/lib/startuphacks-win.c	(revision 648)
@@ -0,0 +1,184 @@
+/* $Id: $ */
+/** @file
+ *
+ * kBuild - Alternative argument parser for the windows startup code.
+ *
+ * Copyright (c) 2006 knut st. osmundsen <bird-kbuild-pszSrc@anduin.net>
+ *
+ * parse_args(): Copyright (c) 1992-1998 by Eberhard Mattes
+ *
+ *
+ * This file is part of kBuild.
+ *
+ * kBuild is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kBuild is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with kBuild; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include <stdlib.h>
+#include <malloc.h>
+#include <Windows.h>
+
+
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static int parse_args(const char *pszSrc, char **argv, char *pchPool);
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** argument count found by parse_args(). */
+static int g_cArgs;
+
+
+
+int __cdecl _setargv(void)
+{
+    static char s_szProgramName[MAX_PATH + 1];
+    const char *pszCmdLine;
+    char       *pszCmdLineBuf;
+    char      **papszArgs = NULL;
+    int         cb;
+
+    /* 
+     * Set the program name. 
+     */
+    GetModuleFileName(NULL, s_szProgramName, MAX_PATH);
+    s_szProgramName[MAX_PATH] = '\0';
+#if _MSC_VER >= 1400
+    _set_pgmptr(s_szProgramName);
+#endif 
+
+    /*
+     * Get the commandline, use the program name if nothings available.
+     */
+    pszCmdLine = (const char *)GetCommandLineA();
+    if (!pszCmdLine || !*pszCmdLine)
+        pszCmdLine = s_szProgramName;
+    
+    /*
+     * Parse the argument commandline emitting the unix argument vector.
+     */
+    cb = parse_args(pszCmdLine, NULL, NULL);
+    papszArgs = malloc(sizeof(*papszArgs) * (g_cArgs + 2));
+    if (!papszArgs)
+        return -1;
+    pszCmdLineBuf = malloc(cb);
+    if (!pszCmdLineBuf)
+        return -1;
+    parse_args(pszCmdLine, papszArgs, pszCmdLineBuf);
+
+    /* set return variables */
+    __argc = g_cArgs;
+    __argv = papszArgs;
+    return 0;
+}
+
+
+/**
+ * Parses the argument string passed in as pszSrc.
+ *
+ * @returns size of the processed arguments.
+ * @param   pszSrc  Pointer to the commandline that's to be parsed.
+ * @param   argv    Pointer to argument vector to put argument pointers in. NULL allowed.
+ * @param   pchPool Pointer to memory pchPool to put the arguments into. NULL allowed.
+ */
+static int parse_args(const char *pszSrc, char **argv, char *pchPool)
+{
+    int   bs;
+    char  chQuote;
+    char *pfFlags;
+    int   cbArgs;
+
+#define PUTC(c) do { ++cbArgs; if (pchPool != NULL) *pchPool++ = (c); } while (0)
+#define PUTV    do { ++g_cArgs; if (argv != NULL) *argv++ = pchPool; } while (0)
+#define WHITE(c) ((c) == ' ' || (c) == '\t')
+
+#define _ARG_DQUOTE   0x01          /* Argument quoted (")                  */
+#define _ARG_RESPONSE 0x02          /* Argument read from response file     */
+#define _ARG_WILDCARD 0x04          /* Argument expanded from wildcard      */
+#define _ARG_ENV      0x08          /* Argument from environment            */
+#define _ARG_NONZERO  0x80          /* Always set, to avoid end of string   */
+
+    g_cArgs = 0; cbArgs = 0;
+
+#if 0
+    /* argv[0] */
+    PUTC((char)_ARG_NONZERO);
+    PUTV;
+    for (;;)
+    {
+        PUTC(*pszSrc);
+        if (*pszSrc == 0)
+            break;
+        ++pszSrc;
+    }
+    ++pszSrc;
+#endif
+
+    for (;;)
+    {
+        while (WHITE(*pszSrc))
+            ++pszSrc;
+        if (*pszSrc == 0)
+            break;
+        pfFlags = pchPool;
+        PUTC((char)_ARG_NONZERO);
+        PUTV;
+        bs = 0; chQuote = 0;
+        for (;;)
+        {
+            if (!chQuote ? (*pszSrc == '"' || *pszSrc == '\'') : *pszSrc == chQuote)
+            {
+                while (bs >= 2)
+                {
+                    PUTC('\\');
+                    bs -= 2;
+                }
+                if (bs & 1)
+                    PUTC(*pszSrc);
+                else
+                {
+                    chQuote = chQuote ? 0 : *pszSrc;
+                    if (pfFlags != NULL)
+                        *pfFlags |= _ARG_DQUOTE;
+                }
+                bs = 0;
+            }
+            else if (*pszSrc == '\\')
+                ++bs;
+            else
+            {
+                while (bs != 0)
+                {
+                    PUTC('\\');
+                    --bs;
+                }
+                if (*pszSrc == 0 || (WHITE(*pszSrc) && !chQuote))
+                    break;
+                PUTC(*pszSrc);
+            }
+            ++pszSrc;
+        }
+        PUTC(0);
+    }
+    return cbArgs;
+}
+
Index: /trunk/src/sed/Makefile.kmk
===================================================================
--- /trunk/src/sed/Makefile.kmk	(revision 647)
+++ /trunk/src/sed/Makefile.kmk	(revision 648)
@@ -37,7 +37,7 @@
 	lib/obstack.c \
 	lib/mkstemp.c \
-	lib/getline.c
+	lib/getline.c \
+	../lib/startuphacks-win.c
 endif
-
 
 include $(PATH_KBUILD)/footer.kmk