diff options
| author | vasiljevic <zv@archiware.com> | 2004-06-10 14:05:24 (GMT) |
|---|---|---|
| committer | vasiljevic <zv@archiware.com> | 2004-06-10 14:05:24 (GMT) |
| commit | bfa6f7aee69e64e0d9bfdc962925640b3a241ecb (patch) | |
| tree | 39b6ee10078699f01493495e6dabc0a296ae1a0c /generic | |
| parent | 1c4cee847c2020e2cf01b5eda482035878b51ae9 (diff) | |
| download | tcl-bfa6f7aee69e64e0d9bfdc962925640b3a241ecb.zip tcl-bfa6f7aee69e64e0d9bfdc962925640b3a241ecb.tar.gz tcl-bfa6f7aee69e64e0d9bfdc962925640b3a241ecb.tar.bz2 | |
Partialy fixed Bug #932314
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIOUtil.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 046039e..33884e0 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.17 2004/05/04 22:26:00 hobbs Exp $ + * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.18 2004/06/10 14:05:24 vasiljevic Exp $ */ #include "tclInt.h" @@ -2624,7 +2624,8 @@ Tcl_FSChdir(pathPtr) objPtr = Tcl_FSGetTranslatedPath(NULL, pathPtr); if (objPtr == NULL) { - return TCL_ERROR; + Tcl_SetErrno(ENOENT); + return -1; } Tcl_IncrRefCount(objPtr); str = Tcl_GetStringFromObj(objPtr, &len); @@ -2644,7 +2645,8 @@ Tcl_FSChdir(pathPtr) #ifdef WIN32 if (objPtr) { Tcl_DecrRefCount(objPtr); } #endif - return TCL_ERROR; + Tcl_SetErrno(ENOENT); + return -1; } fsPtr = Tcl_FSGetFileSystemForPath(pathPtr); @@ -2675,7 +2677,7 @@ Tcl_FSChdir(pathPtr) * calculated above, and we must therefore cache that * information. */ - if (retVal == TCL_OK) { + if (retVal == 0) { /* * Note that this normalized path may be different to what * we found above (or at least a different object), if the @@ -2690,7 +2692,8 @@ Tcl_FSChdir(pathPtr) #ifdef WIN32 if (objPtr) { Tcl_DecrRefCount(objPtr); } #endif - return TCL_ERROR; + Tcl_SetErrno(ENOENT); + return -1; } FsUpdateCwd(normDirName); } @@ -3838,7 +3841,13 @@ Tcl_FSGetFileSystemForPath(pathObjPtr) /* * Check if the filesystem has changed in some way since * this object's internal representation was calculated. + * Before doing that, assure we have the most up-to-date + * copy of the master filesystem. This is accomplished + * by the FsGetFirstFilesystem() call. */ + + fsRecPtr = FsGetFirstFilesystem(); + if (TclFSEnsureEpochOk(pathObjPtr, &retVal) != TCL_OK) { return NULL; } @@ -3849,7 +3858,6 @@ Tcl_FSGetFileSystemForPath(pathObjPtr) * succeeded. */ - fsRecPtr = FsGetFirstFilesystem(); while ((retVal == NULL) && (fsRecPtr != NULL)) { Tcl_FSPathInFilesystemProc *proc = fsRecPtr->fsPtr->pathInFilesystemProc; if (proc != NULL) { |