summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasiljevic <zv@archiware.com>2004-06-09 16:15:23 (GMT)
committervasiljevic <zv@archiware.com>2004-06-09 16:15:23 (GMT)
commit05b282b4658500f59d471eb22d52d0aff13b71aa (patch)
tree168821d386e828b73fc78fa08d258eb096c02774
parente8001372a990fb7ff88cbab5b1661413d9da68c6 (diff)
downloadtcl-05b282b4658500f59d471eb22d52d0aff13b71aa.zip
tcl-05b282b4658500f59d471eb22d52d0aff13b71aa.tar.gz
tcl-05b282b4658500f59d471eb22d52d0aff13b71aa.tar.bz2
Partially corrected [Bug 932314]
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclIOUtil.c17
2 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cf8b088..443fe2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-09 Zoran Vasiljevic <vasiljevic@users.sf.net>
+
+ * generic/tclIOUtil.c: partially corrected [Bug 932314].
+ Also, corrected return values of Tcl_FSChdir() to
+ reflect those of the underlying platform-specific call.
+ Originally, return codes were mixed with those of Tcl.
+
2004-06-08 Miguel Sofer <msofer@users.sf.net>
* generic/tclCompile.c:
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 3d3ef91..75f9849 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.103 2004/05/08 15:51:41 vincentdarley Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.104 2004/06/09 16:15:23 vasiljevic Exp $
*/
#include "tclInt.h"
@@ -2610,7 +2610,8 @@ Tcl_FSChdir(pathPtr)
int retVal = -1;
if (Tcl_FSGetNormalizedPath(NULL, pathPtr) == NULL) {
- return TCL_ERROR;
+ Tcl_SetErrno(ENOENT);
+ return (retVal);
}
fsPtr = Tcl_FSGetFileSystemForPath(pathPtr);
@@ -2641,7 +2642,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
@@ -2653,7 +2654,8 @@ Tcl_FSChdir(pathPtr)
*/
Tcl_Obj *normDirName = Tcl_FSGetNormalizedPath(NULL, pathPtr);
if (normDirName == NULL) {
- return TCL_ERROR;
+ Tcl_SetErrno(ENOENT); /*Not really true, but what else to do?*/
+ return -1;
}
if (fsPtr == &tclNativeFilesystem) {
/*
@@ -3990,7 +3992,13 @@ Tcl_FSGetFileSystemForPath(pathPtr)
/*
* 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(pathPtr, &retVal) != TCL_OK) {
return NULL;
}
@@ -4001,7 +4009,6 @@ Tcl_FSGetFileSystemForPath(pathPtr)
* succeeded.
*/
- fsRecPtr = FsGetFirstFilesystem();
while ((retVal == NULL) && (fsRecPtr != NULL)) {
Tcl_FSPathInFilesystemProc *proc = fsRecPtr->fsPtr->pathInFilesystemProc;
if (proc != NULL) {