diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-06-10 16:55:38 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-06-10 16:55:38 (GMT) |
| commit | b883043c6a750576d959ad7cab775c41c6076cae (patch) | |
| tree | 2a428e9f0ccc77d5515ec3f09f00b734d3aa94d7 /generic | |
| parent | 05b282b4658500f59d471eb22d52d0aff13b71aa (diff) | |
| download | tcl-b883043c6a750576d959ad7cab775c41c6076cae.zip tcl-b883043c6a750576d959ad7cab775c41c6076cae.tar.gz tcl-b883043c6a750576d959ad7cab775c41c6076cae.tar.bz2 | |
* generic/tclPathObj.c: Corrected [file tail] results when operating
on a path produced by TclNewFSPathObj(). [Bug 970529]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclPathObj.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 7a11e56..b27b6b5 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.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: tclPathObj.c,v 1.32 2004/06/08 19:18:39 dgp Exp $ + * RCS: @(#) $Id: tclPathObj.c,v 1.33 2004/06/10 16:55:39 dgp Exp $ */ #include "tclInt.h" @@ -518,6 +518,21 @@ TclPathPart(interp, pathPtr, portion) return fsPathPtr->cwdPtr; } case TCL_PATH_TAIL: { + /* + * Check if the joined-on bit has any directory + * delimiters in it. If so, the 'tail' would + * be only the part following the last delimiter. + * We could handle that special case here, but we + * don't, and instead just use the standardPath code. + */ + CONST char *rest = Tcl_GetString(fsPathPtr->normPathPtr); + if (strchr(rest, '/') != NULL) { + goto standardPath; + } + if ((tclPlatform == TCL_PLATFORM_WINDOWS) + && (strchr(rest, '\\') != NULL)) { + goto standardPath; + } Tcl_IncrRefCount(fsPathPtr->normPathPtr); return fsPathPtr->normPathPtr; } |