summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2010-01-05 18:58:36 (GMT)
committerdgp <dgp@users.sourceforge.net>2010-01-05 18:58:36 (GMT)
commit0e23807506cde25fbd9689f83c09a35db89fa79f (patch)
tree0e5236fc16ed5cb30ddc15cf053d21bcf49dcf89 /generic
parent5e5cf63c514ffd9ca54093a7dd98c00443e7d67c (diff)
downloadtcl-0e23807506cde25fbd9689f83c09a35db89fa79f.zip
tcl-0e23807506cde25fbd9689f83c09a35db89fa79f.tar.gz
tcl-0e23807506cde25fbd9689f83c09a35db89fa79f.tar.bz2
* generic/tclPathObj.c (TclPathPart): Correct inconsistency between
* tests/fileName.test (filename-14.31): the string rep and the intrep of a path value created by [file rootname]. Thanks to Vitaly Magerya for reporting. [Bug 2918610]
Diffstat (limited to 'generic')
-rw-r--r--generic/tclPathObj.c36
1 files changed, 10 insertions, 26 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 610c05e..d6f2618 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.85 2009/12/21 23:25:39 nijtmans Exp $
+ * RCS: @(#) $Id: tclPathObj.c,v 1.86 2010/01/05 18:58:36 dgp Exp $
*/
#include "tclInt.h"
@@ -661,34 +661,18 @@ TclPathPart(
return pathPtr;
} else {
/*
- * Duplicate the object we were given and then trim off
- * the extension of the tail component of the path.
+ * Need to return the whole path with the extension
+ * suffix removed. Do that by joining our "head" to
+ * our "tail" with the extension suffix removed from
+ * the tail.
*/
- FsPath *fsDupPtr;
- Tcl_Obj *root = Tcl_DuplicateObj(pathPtr);
+ Tcl_Obj *resultPtr =
+ TclNewFSPathObj(fsPathPtr->cwdPtr, fileName,
+ (int)(length - strlen(extension)));
- Tcl_IncrRefCount(root);
- fsDupPtr = PATHOBJ(root);
- if (Tcl_IsShared(fsDupPtr->normPathPtr)) {
- TclDecrRefCount(fsDupPtr->normPathPtr);
- fsDupPtr->normPathPtr = Tcl_NewStringObj(fileName,
- (int)(length - strlen(extension)));
- Tcl_IncrRefCount(fsDupPtr->normPathPtr);
- } else {
- Tcl_SetObjLength(fsDupPtr->normPathPtr,
- (int)(length - strlen(extension)));
- }
-
- /*
- * Must also trim the string representation if we have it.
- */
-
- if (root->bytes != NULL && root->length > 0) {
- root->length -= strlen(extension);
- root->bytes[root->length] = 0;
- }
- return root;
+ Tcl_IncrRefCount(resultPtr);
+ return resultPtr;
}
}
default: