diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-21 08:07:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-21 08:07:40 (GMT) |
| commit | 07bdaceb97e059a802ca158f1661c23e651ec949 (patch) | |
| tree | 1ed1f0a3e8be5199be20e9651bf3251f474087b3 /generic/tclPathObj.c | |
| parent | 040753e40a5a86ac36162436f039def7a7238dc9 (diff) | |
| parent | dbf049c0fba4506927b17c7ff9f7d66aa61cde18 (diff) | |
| download | tcl-jn_no_struct_names.zip tcl-jn_no_struct_names.tar.gz tcl-jn_no_struct_names.tar.bz2 | |
unnecessary hook struct definitionsjn_no_struct_names
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 14c61a9..f4d61f2 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -1764,7 +1764,7 @@ Tcl_FSGetNormalizedPath( */ Tcl_Obj *dir, *copy; - int cwdLen, pathType; + int tailLen, cwdLen, pathType; pathType = Tcl_FSGetPathType(fsPathPtr->cwdPtr); dir = Tcl_FSGetNormalizedPath(interp, fsPathPtr->cwdPtr); @@ -1776,7 +1776,12 @@ Tcl_FSGetNormalizedPath( UpdateStringOfFsPath(pathPtr); } - copy = AppendPath(dir, fsPathPtr->normPathPtr); + Tcl_GetStringFromObj(fsPathPtr->normPathPtr, &tailLen); + if (tailLen) { + copy = AppendPath(dir, fsPathPtr->normPathPtr); + } else { + copy = Tcl_DuplicateObj(dir); + } Tcl_IncrRefCount(dir); Tcl_IncrRefCount(copy); |