summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2006-03-28 09:41:47 (GMT)
committervincentdarley <vincentdarley>2006-03-28 09:41:47 (GMT)
commit2f7d6ab5ab70c57e43f6f19a7775938f764e03f3 (patch)
treef785e2b5faf995016b3da475bc43dd8984badb4b
parent36e65e3f6c96a419665af91a18fb09bb79bcece2 (diff)
downloadtcl-2f7d6ab5ab70c57e43f6f19a7775938f764e03f3.zip
tcl-2f7d6ab5ab70c57e43f6f19a7775938f764e03f3.tar.gz
tcl-2f7d6ab5ab70c57e43f6f19a7775938f764e03f3.tar.bz2
nativeFilesystemRecord comparisons
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclIOUtil.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 01b4b46..44e411c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28 Vince Darley <vincentdarley@sourceforge.net>
+
+ * generic/tclIOUtil.c: fix to nativeFilesystemRecord comparisons
+ (lesser part of [Bug 1064247])
+
2006-03-27 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/tclWinTest.c: Fixes for bug #1456373 (mingw-gcc issue)
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index e281026..73a828a 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.129 2006/03/16 18:22:57 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.130 2006/03/28 09:41:47 vincentdarley Exp $
*/
#include "tclInt.h"
@@ -794,7 +794,7 @@ TclFinalizeFilesystem(void)
* The native filesystem is static, so we don't free it.
*/
- if (fsRecPtr != &nativeFilesystemRecord) {
+ if (fsRecPtr->fsPtr != &tclNativeFilesystem) {
ckfree((char *)fsRecPtr);
}
}
@@ -977,7 +977,7 @@ Tcl_FSUnregister(
*/
fsRecPtr = filesystemList;
- while ((retVal == TCL_ERROR) && (fsRecPtr != &nativeFilesystemRecord)) {
+ while ((retVal == TCL_ERROR) && (fsRecPtr->fsPtr != &tclNativeFilesystem)) {
if (fsRecPtr->fsPtr == fsPtr) {
if (fsRecPtr->prevPtr) {
fsRecPtr->prevPtr->nextPtr = fsRecPtr->nextPtr;
@@ -1426,7 +1426,7 @@ TclFSNormalizeToUniquePath(
fsRecPtr = firstFsRecPtr;
while (fsRecPtr != NULL) {
- if (fsRecPtr == &nativeFilesystemRecord) {
+ if (fsRecPtr->fsPtr == &tclNativeFilesystem) {
Tcl_FSNormalizePathProc *proc = fsRecPtr->fsPtr->normalizePathProc;
if (proc != NULL) {
startAt = (*proc)(interp, pathPtr, startAt);
@@ -1442,7 +1442,7 @@ TclFSNormalizeToUniquePath(
* Skip the native system next time through.
*/
- if (fsRecPtr != &nativeFilesystemRecord) {
+ if (fsRecPtr->fsPtr != &tclNativeFilesystem) {
Tcl_FSNormalizePathProc *proc = fsRecPtr->fsPtr->normalizePathProc;
if (proc != NULL) {
startAt = (*proc)(interp, pathPtr, startAt);
@@ -3669,7 +3669,7 @@ FsListMounts(
fsRecPtr = FsGetFirstFilesystem();
while (fsRecPtr != NULL) {
- if (fsRecPtr != &nativeFilesystemRecord) {
+ if (fsRecPtr->fsPtr != &tclNativeFilesystem) {
Tcl_FSMatchInDirectoryProc *proc =
fsRecPtr->fsPtr->matchInDirectoryProc;
if (proc != NULL) {