diff options
| author | dgp <dgp@users.sourceforge.net> | 2005-05-05 18:37:43 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2005-05-05 18:37:43 (GMT) |
| commit | 06ccaebaafb55508004011a0cb9ec73a6872c23b (patch) | |
| tree | 528333d487c2d5ed865f278d50536ea98959741c /generic/tclIO.c | |
| parent | 9c427bf1e80bcbb05860cb838266240040b91f07 (diff) | |
| download | tcl-06ccaebaafb55508004011a0cb9ec73a6872c23b.zip tcl-06ccaebaafb55508004011a0cb9ec73a6872c23b.tar.gz tcl-06ccaebaafb55508004011a0cb9ec73a6872c23b.tar.bz2 | |
* generic/tclInt.decls: Converted TclMatchIsTrivial to a macro.
* generic/tclInt.h:
* generic/tclUtil.c:
* generic/tclIntDecls.h: `make genstubs`
* generic/tclStubInit.c:
* generic/tclBasic.c: Added callers of TclMatchIsTrivial where
* generic/tclCmdIL.c: a search can be done more efficiently
* generic/tclCompCmds.c:when it is recognized that a pattern match
* generic/tclDictObj.c: is really an exact match. [Patch 1076088]
* generic/tclIO.c:
* generic/tclNamesp.c:
* generic/tclVar.c:
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 02b4fe8..e94264a 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIO.c,v 1.84 2005/04/14 02:41:15 davygrvy Exp $ + * RCS: @(#) $Id: tclIO.c,v 1.85 2005/05/05 18:37:58 dgp Exp $ */ #include "tclInt.h" @@ -8766,7 +8766,16 @@ Tcl_GetChannelNamesEx(interp, pattern) hTblPtr = GetChannelTable(interp); TclNewObj(resultPtr); - + if ((pattern != NULL) && TclMatchIsTrivial(pattern) + && !((pattern[0] == 's') && (pattern[1] == 't') + && (pattern[2] == 'd'))) { + if ((Tcl_FindHashEntry(hTblPtr, pattern) != NULL) + && (Tcl_ListObjAppendElement(interp, resultPtr, + Tcl_NewStringObj(pattern, -1)) != TCL_OK)) { + goto error; + } + goto done; + } for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch); hPtr != (Tcl_HashEntry *) NULL; hPtr = Tcl_NextHashEntry(&hSearch)) { @@ -8790,10 +8799,12 @@ Tcl_GetChannelNamesEx(interp, pattern) if (((pattern == NULL) || Tcl_StringMatch(name, pattern)) && (Tcl_ListObjAppendElement(interp, resultPtr, Tcl_NewStringObj(name, -1)) != TCL_OK)) { +error: TclDecrRefCount(resultPtr); return TCL_ERROR; } } +done: Tcl_SetObjResult(interp, resultPtr); return TCL_OK; } |