diff options
| author | vincentdarley <vincentdarley> | 2003-11-20 19:05:43 (GMT) |
|---|---|---|
| committer | vincentdarley <vincentdarley> | 2003-11-20 19:05:43 (GMT) |
| commit | baea4220439866995f3c1a6cf225b0fe75bfb4bc (patch) | |
| tree | 40439c0d1d1ca49c98afe523ca94d4bee0bad56e /generic/tclIOUtil.c | |
| parent | 9285e260b4b455996aedbde9d1bda9c2bceca579 (diff) | |
| download | tcl-baea4220439866995f3c1a6cf225b0fe75bfb4bc.zip tcl-baea4220439866995f3c1a6cf225b0fe75bfb4bc.tar.gz tcl-baea4220439866995f3c1a6cf225b0fe75bfb4bc.tar.bz2 | |
fix to 'cd' infinite recursion bug on Windows
Diffstat (limited to 'generic/tclIOUtil.c')
| -rw-r--r-- | generic/tclIOUtil.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 2da3666..de12596 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -17,7 +17,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.11 2003/10/22 22:35:46 andreas_kupries Exp $ + * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.12 2003/11/20 19:05:44 vincentdarley Exp $ */ #include "tclInt.h" @@ -5572,15 +5572,22 @@ Tcl_FSGetNormalizedPath(interp, pathObjPtr) } if (drive[0] == drive_c) { absolutePath = Tcl_DuplicateObj(useThisCwd); - Tcl_IncrRefCount(absolutePath); - Tcl_AppendToObj(absolutePath, "/", 1); - Tcl_AppendToObj(absolutePath, path+2, -1); /* We have a refCount on the cwd */ } else { - /* We just can't handle it correctly here */ Tcl_DecrRefCount(useThisCwd); useThisCwd = NULL; + /* + * The path is not in the current drive, but + * is volume-relative. The way Tcl 8.3 handles + * this is that it treats such a path as + * relative to the root of the drive. We + * therefore behave the same here. + */ + absolutePath = Tcl_NewStringObj(path, 2); } + Tcl_IncrRefCount(absolutePath); + Tcl_AppendToObj(absolutePath, "/", 1); + Tcl_AppendToObj(absolutePath, path+2, -1); } #endif /* __WIN32__ */ } |