fs fixed commit

3 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ceed2f..14d171f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	* generic/tclIOUtil.c: improved and sped up handling of
 	native paths (duplication and conversion to normalized paths),
 	particularly on Windows.
+	* modified part of above commit, due to problems on Linux. 
+	Will re-examine bug report and evaluate more closely.
 
 2002-06-07  Don Porter  <dgp@users.sourceforge.net>
 
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index c44687b..f5ee327 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.46 2002/06/10 10:41:29 vincentdarley Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.47 2002/06/10 17:41:52 vincentdarley Exp $
  */
 
 #include "tclInt.h"
@@ -4485,11 +4485,11 @@ NativeDupInternalRep(clientData)
 	len = sizeof(WCHAR) + (wcslen((CONST WCHAR*)clientData) * sizeof(WCHAR));
     } else {
 	/* ansi representation when running on 95/98/ME */
-	len = sizeof(CHAR) + (strlen((CONST CHAR*)clientData) * sizeof(CHAR));
+	len = sizeof(char) + (strlen((CONST char*)clientData) * sizeof(char));
     }
 #else
     /* ansi representation when running on Unix/MacOS */
-    len = sizeof(CHAR) + (strlen((CONST CHAR*)clientData) * sizeof(CHAR));
+    len = sizeof(char) + (strlen((CONST char*)clientData) * sizeof(char));
 #endif
     
     copy = (ClientData) ckalloc(len);
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 7a62bc7..37921fc 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixFCmd.c,v 1.22 2002/06/10 10:41:29 vincentdarley Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.23 2002/06/10 17:41:52 vincentdarley Exp $
  *
  * Portions of this code were derived from NetBSD source code which has
  * the following copyright notice:
@@ -1692,7 +1692,7 @@ TclpObjNormalizePath(interp, pathPtr, nextCheckpoint)
 	    nextCheckpoint = currentPathEndPosition - path;
 	} else if (cur == 0) {
 	    /* Reached end of string */
-	    nextCheckpoint = pathLen;
+	    /* nextCheckpoint = pathLen; */
 	    break;
 	}
 	currentPathEndPosition++;