Index: /trunk/src/kObjCache/kObjCache.c =================================================================== --- /trunk/src/kObjCache/kObjCache.c (revision 2408) +++ /trunk/src/kObjCache/kObjCache.c (revision 2409) @@ -70,4 +70,5 @@ #if defined(__WIN__) # include +# include "quoted_spawn.h" #endif @@ -325,15 +326,57 @@ * @param pszPath1 The first path. * @param pszPath2 The second path. - * @param cch The number of characters to compare. - */ -static int ArePathsIdentical(const char *pszPath1, const char *pszPath2, size_t cch) + */ +static int ArePathsIdentical(const char *pszPath1, const char *pszPath2) { #if defined(__OS2__) || defined(__WIN__) - if (strnicmp(pszPath1, pszPath2, cch)) + if (stricmp(pszPath1, pszPath2)) { /* Slashes may differ, compare char by char. */ const char *psz1 = pszPath1; const char *psz2 = pszPath2; - for (;cch; psz1++, psz2++, cch--) + for (;;) + { + if (*psz1 != *psz2) + { + if ( tolower(*psz1) != tolower(*psz2) + && toupper(*psz1) != toupper(*psz2) + && *psz1 != '/' + && *psz1 != '\\' + && *psz2 != '/' + && *psz2 != '\\') + return 0; + } + if (!*psz1) + break; + psz1++; + psz2++; + } + } + return 1; +#else + return !strcmp(pszPath1, pszPath2); +#endif +} + +/** + * Compares two path strings to see if they are identical. + * + * This doesn't do anything fancy, just the case ignoring and + * slash unification. + * + * @returns 1 if equal, 0 otherwise. + * @param pszPath1 The first path. + * @param pszPath2 The second path. + * @param cch The number of characters to compare. + */ +static int ArePathsIdenticalN(const char *pszPath1, const char *pszPath2, size_t cch) +{ +#if defined(__OS2__) || defined(__WIN__) + if (strnicmp(pszPath1, pszPath2, cch)) + { + /* Slashes may differ, compare char by char. */ + const char *psz1 = pszPath1; + const char *psz2 = pszPath2; + for ( ; cch; psz1++, psz2++, cch--) { if (*psz1 != *psz2) @@ -372,5 +415,5 @@ * This is indeed a bit tricky, so we'll try the easy way first... */ - if (ArePathsIdentical(pszPath, pszDir, cchDir)) + if (ArePathsIdenticalN(pszPath, pszDir, cchDir)) { if (pszPath[cchDir]) @@ -382,5 +425,5 @@ { pszAbsPath = AbsPath(pszPath); - if (ArePathsIdentical(pszAbsPath, pszDir, cchDir)) + if (ArePathsIdenticalN(pszAbsPath, pszDir, cchDir)) { if (pszPath[cchDir]) @@ -1144,5 +1187,5 @@ size_t cch = strlen(papszArgv[i]); if ( cch < cchIgnorePath - || !ArePathsIdentical(papszArgv[i] + cch - cchIgnorePath, pszIgnorePath, cch)) + || !ArePathsIdenticalN(papszArgv[i] + cch - cchIgnorePath, pszIgnorePath, cch)) kOCSumUpdate(pSum, &Ctx, papszArgv[i], cch + 1); } @@ -1581,10 +1624,14 @@ errno = 0; +# ifdef __WIN__ + rc = quoted_spawnvp(_P_WAIT, papszArgv[0], papszArgv); +# else rc = _spawnvp(_P_WAIT, papszArgv[0], papszArgv); +# endif if (rc < 0) FatalDie("%s - _spawnvp failed (rc=0x%p): %s\n", pszMsg, rc, strerror(errno)); if (rc > 0) FatalDie("%s - failed rc=%d\n", pszMsg, (int)rc); - if (fdStdOut) + if (fdStdOut != -1) { close(STDOUT_FILENO); @@ -1684,5 +1731,9 @@ #if defined(__OS2__) || defined(__WIN__) errno = 0; +# ifdef __WIN__ + pid = quoted_spawnvp(_P_NOWAIT, papszArgv[0], papszArgv); +# else pid = _spawnvp(_P_NOWAIT, papszArgv[0], papszArgv); +# endif if (pid == -1) FatalDie("precompile - _spawnvp failed: %s\n", strerror(errno)); @@ -3490,5 +3541,5 @@ PKOCDIGEST pDigest = &pCache->paDigests[i]; if (ArePathsIdentical(kOCDigestAbsPath(pDigest, pCache->pszDir), - kOCEntryAbsPath(pEntry), ~0U)) + kOCEntryAbsPath(pEntry))) { unsigned cLeft; Index: /trunk/src/lib/Makefile.kmk =================================================================== --- /trunk/src/lib/Makefile.kmk (revision 2408) +++ /trunk/src/lib/Makefile.kmk (revision 2409) @@ -38,5 +38,7 @@ kUtil_DEFS.win = __WIN__ kUtil_SOURCES = crc32.c md5.c -kUtil_SOURCES.win = nt_fullpath.c +kUtil_SOURCES.win = \ + nt_fullpath.c \ + quoted_spawn.c kUtil_NOINST = 1 Index: /trunk/src/lib/quoted_spawn.c =================================================================== --- /trunk/src/lib/quoted_spawn.c (revision 2409) +++ /trunk/src/lib/quoted_spawn.c (revision 2409) @@ -0,0 +1,276 @@ +/* $Id$ */ +/** @file + * quote_spawn - Correctly Quote The _spawnvp arguments, windows specific. + */ + +/* + * Copyright (c) 2010 knut st. osmundsen + * + * 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 3 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, see + * + */ + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include "quoted_spawn.h" + +#include +#include +#include +#include +#include +#include + + +/** + * Tests if a strings needs quoting. + * + * @returns 1 if needs, 0 if it doesn't. + * @param pszArg The string in question. + */ +static int quoted_spawn_need_quoting(const char *pszArg) +{ + for (;;) + switch (*pszArg++) + { + case 0: + return 0; + + case ' ': + case '"': + case '&': + case '>': + case '<': + case '|': + case '%': + /* Quote the control chars (tab is included). */ + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + case 21: + case 22: + case 23: + case 24: + case 25: + case 26: + case 27: + case 28: + case 29: + case 30: + case 31: + return 1; + } +} + +/** + * Frees any quoted arguments. + * + * @returns NULL. + * @param papszArgsOrg The original argument vector. + * @param papszArgsQuoted The quoted argument vector. + * @param cArgs The number of arguments in the vector. + */ +static const char * const * +quoted_spawn_free(const char * const *papszArgsOrg, const char * const *papszArgsQuoted, unsigned cArgs) +{ + if ( papszArgsOrg != papszArgsQuoted + && papszArgsQuoted != NULL) + { + int iSavedErrno = errno; /* A bit of paranoia. */ + unsigned i = cArgs; + while (i-- > 0) + if (papszArgsQuoted[i] != papszArgsOrg[i]) + free((char *)papszArgsQuoted[i]); + free((void *)papszArgsQuoted); + errno = iSavedErrno; + } + return NULL; +} + +/** + * Quote an argument string. + * + * @returns Quoted argument string (new). + * @param pszArgOrg The original string. + */ +static const char *quoted_spawn_quote_arg(const char *pszArgOrg) +{ + size_t cchArgOrg = strlen(pszArgOrg); + size_t cchArgNew = 1 + cchArgOrg * 2 + 1 + 1; + char *pszArgNew = malloc(cchArgNew); + if (pszArgNew) + { + char ch; + char *pszDst = pszArgNew; + *pszDst++ = '"'; + while ((ch = *pszArgOrg++)) + { + if (ch == '\\') + { + size_t cSlashes = 1; + for (;;) + { + *pszDst++ = '\\'; + ch = *pszArgOrg; + if (ch != '\\') + break; + pszArgOrg++; + cSlashes++; + } + if (ch == '"' || ch == '\0') + { + while (cSlashes-- > 0) + *pszDst++ = '\\'; + if (ch == '\0') + break; + *pszDst++ = '\\'; + *pszDst++ = '"'; + } + } + else if (ch == '"') + { + *pszDst++ = '\\'; + *pszDst++ = '"'; + } + else + *pszDst++ = ch; + } + *pszDst++ = '"'; + *pszDst = '\0'; + assert((size_t)(pszDst - pszArgNew) < cchArgNew - 1); + } + return pszArgNew; +} + +/** + * Quotes the arguments in an argument vector, producing a new vector. + * + * @returns The quoted argument vector. + * @param papszArgsOrg The vector which arguments to quote. + * @param iFirstArg The first argument that needs quoting. + * @param pcArgs Where to return the argument count. + */ +static const char * const * +quoted_spawn_quote_vector(const char * const *papszArgsOrg, unsigned iFirstArg, unsigned *pcArgs) +{ + const char **papszArgsQuoted; + unsigned cArgs; + unsigned iArg; + + /* finish counting them and allocate the result array. */ + cArgs = iFirstArg; + while (papszArgsOrg[cArgs]) + cArgs++; + *pcArgs = cArgs; + + papszArgsQuoted = (const char **)calloc(sizeof(const char *), cArgs + 1); + if (!papszArgsQuoted) + return NULL; + + /* Process the arguments up to the first quoted one (no need to + re-examine them). */ + for (iArg = 0; iArg < iFirstArg; iArg++) + papszArgsQuoted[iArg] = papszArgsOrg[iArg]; + + papszArgsQuoted[iArg] = quoted_spawn_quote_arg(papszArgsOrg[iArg]); + if (!papszArgsQuoted[iArg]) + return quoted_spawn_free(papszArgsOrg, papszArgsQuoted, cArgs); + + /* Process the remaining arguments. */ + while (iArg < cArgs) + { + if (!quoted_spawn_need_quoting(papszArgsOrg[iArg])) + papszArgsQuoted[iArg] = papszArgsOrg[iArg]; + else + { + papszArgsQuoted[iArg] = quoted_spawn_quote_arg(papszArgsOrg[iArg]); + if (!papszArgsQuoted[iArg]) + return quoted_spawn_free(papszArgsOrg, papszArgsQuoted, cArgs); + } + iArg++; + } + + return papszArgsQuoted; +} + +/** + * Checks if any of the arguments in the vector needs quoting and does the job. + * + * @returns If anything needs quoting a new vector is returned, otherwise the + * original is returned. + * @param papszArgsOrg The argument vector to check. + * @param pcArgs Where to return the argument count. + */ +static const char * const * +quoted_spawn_maybe_quote(const char * const *papszArgsOrg, unsigned *pcArgs) +{ + unsigned iArg; + for (iArg = 0; papszArgsOrg[iArg]; iArg++) + if (quoted_spawn_need_quoting(papszArgsOrg[iArg])) + return quoted_spawn_quote_vector(papszArgsOrg, iArg, pcArgs); + *pcArgs = iArg; + return papszArgsOrg; +} + +/** + * Wrapper for _spawnvp. + * + * @returns The process handle, see _spawnvp for details. + * @param fMode The spawn mode, see _spawnvp for details. + * @param pszExecPath The path to the executable, or just the name + * if a PATH search is desired. + * @param papszArgs The arguments to pass to the new process. + */ +intptr_t quoted_spawnvp(int fMode, const char *pszExecPath, const char * const *papszArgs) +{ + intptr_t hProcess; + unsigned cArgs; + const char * const *papszArgsQuoted = quoted_spawn_maybe_quote(papszArgs, &cArgs); + if (papszArgsQuoted) + { +//unsigned i; +//fprintf(stderr, "debug: spawning '%s'\n", pszExecPath); +//for (i = 0; i < cArgs; i++) +// fprintf(stderr, "debug: #%02u: '%s'\n", i, papszArgsQuoted[i]); + hProcess = _spawnvp(fMode, pszExecPath, papszArgsQuoted); + quoted_spawn_free(papszArgs, papszArgsQuoted, cArgs); + } + else + { + errno = ENOMEM; + hProcess = -1; + } + + return hProcess; +} + Index: /trunk/src/lib/quoted_spawn.h =================================================================== --- /trunk/src/lib/quoted_spawn.h (revision 2409) +++ /trunk/src/lib/quoted_spawn.h (revision 2409) @@ -0,0 +1,34 @@ +/* $Id$ */ +/** @file + * quote_spawn - Correctly Quote The _spawnvp arguments, windows specific. + */ + +/* + * Copyright (c) 2010 knut st. osmundsen + * + * 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 3 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, see + * + */ + + +#ifndef ___quoted_spawn_h___ +#define ___quoted_spawn_h___ + +#include "mytypes.h" +intptr_t quoted_spawnvp(int fMode, const char *pszExecPath, const char * const *papszArgs); + +#endif +