diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2006-09-30 19:20:09 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2006-09-30 19:20:09 (GMT) |
| commit | 6038a3e7e943a56a3a1d383b9048d2785d4171f3 (patch) | |
| tree | 6b1abc484b3d5976f48dd311a66eb987d5afabe7 /generic/tclUtil.c | |
| parent | ce214ead30c417294e6701b0b07d0b6cc8f455c2 (diff) | |
| download | tcl-6038a3e7e943a56a3a1d383b9048d2785d4171f3.zip tcl-6038a3e7e943a56a3a1d383b9048d2785d4171f3.tar.gz tcl-6038a3e7e943a56a3a1d383b9048d2785d4171f3.tar.bz2 | |
2006-09-30 Miguel Sofer <msofer@users.sf.net>
* generic/tclUtil.c (Tcl_SplitList): optimisation, [Patch 1344747]
by dgp.
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 57fc6e0..d12ebe8 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUtil.c,v 1.36.2.6 2005/04/05 16:40:16 dgp Exp $ + * RCS: @(#) $Id: tclUtil.c,v 1.36.2.7 2006/09/30 19:20:12 msofer Exp $ */ #include "tclInt.h" @@ -436,15 +436,26 @@ Tcl_SplitList(interp, list, argcPtr, argvPtr) * the number of space characters in the list. */ - for (size = 1, l = list; *l != 0; l++) { + for (size = 2, l = list; *l != 0; l++) { if (isspace(UCHAR(*l))) { /* INTL: ISO space. */ size++; + /* Consecutive space can only count as a single list delimiter */ + while (1) { + char next = *(l + 1); + if (next == '\0') { + break; + } + ++l; + if (isspace(UCHAR(next))) { + continue; + } + break; + } } } - size++; /* Leave space for final NULL pointer. */ + length = l - list; argv = (CONST char **) ckalloc((unsigned) - ((size * sizeof(char *)) + (l - list) + 1)); - length = strlen(list); + ((size * sizeof(char *)) + length + 1)); for (i = 0, p = ((char *) argv) + size*sizeof(char *); *list != 0; i++) { CONST char *prevList = list; |