summaryrefslogtreecommitdiffstats
path: root/generic/tclFileName.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-01-24 02:29:57 (GMT)
committerhobbs <hobbs>2000-01-24 02:29:57 (GMT)
commit5c9fad7cc43d58cfd041aa40602c94693debe602 (patch)
treeb692e597cc955c3e8638ce2fed09953390788370 /generic/tclFileName.c
parente75bb1f59bc6a1d44daa865b8a15416f8a7a9175 (diff)
downloadtcl-5c9fad7cc43d58cfd041aa40602c94693debe602.zip
tcl-5c9fad7cc43d58cfd041aa40602c94693debe602.tar.gz
tcl-5c9fad7cc43d58cfd041aa40602c94693debe602.tar.bz2
* generic/tclInt.h:
* generic/tcl.decls: moved Tcl_ProcObjCmd to stubs table [Bug: 3827] and removed 'register' from stub definition of Tcl_AppendUnicodeToObj [Bug: 4038] * generic/tclFileName.c: improved guessing of path separator for the Mac. (Darley)
Diffstat (limited to 'generic/tclFileName.c')
-rw-r--r--generic/tclFileName.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 19920cd..d1d9c65 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.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: tclFileName.c,v 1.8 2000/01/11 22:08:59 hobbs Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.9 2000/01/24 02:29:58 hobbs Exp $
*/
#include "tclInt.h"
@@ -1293,11 +1293,7 @@ Tcl_GlobObjCmd(dummy, interp, objc, objv)
separators = "/\\:";
break;
case TCL_PLATFORM_MAC:
- if ((pathOrDir != NULL) && (strchr(pathOrDir, ':') == NULL)) {
- separators = "/";
- } else {
- separators = ":";
- }
+ separators = ":";
break;
}
if (dir == PATH_GENERAL) {
@@ -1609,8 +1605,11 @@ TclGlob(interp, pattern, unquotedPrefix, globFlags, types)
separators = "/\\:";
break;
case TCL_PLATFORM_MAC:
- separators = (strchr(pattern, ':') == NULL)
- ? "/" : ":";
+ if (unquotedPrefix == NULL) {
+ separators = (strchr(pattern, ':') == NULL) ? "/" : ":";
+ } else {
+ separators = ":";
+ }
break;
}