diff options
author | hobbs <hobbs@noemail.net> | 2000-01-24 02:29:57 (GMT) |
---|---|---|
committer | hobbs <hobbs@noemail.net> | 2000-01-24 02:29:57 (GMT) |
commit | a1a9ff082565fb779d12ecc6244d6edd6721e435 (patch) | |
tree | b692e597cc955c3e8638ce2fed09953390788370 /generic/tclFileName.c | |
parent | d671836a966b523ecc90a6ec602a11d2cc6e4dc6 (diff) | |
download | tcl-a1a9ff082565fb779d12ecc6244d6edd6721e435.zip tcl-a1a9ff082565fb779d12ecc6244d6edd6721e435.tar.gz tcl-a1a9ff082565fb779d12ecc6244d6edd6721e435.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)
FossilOrigin-Name: 981dd41cfbe8dbb4df9ab32ad30d2e4af2dc0417
Diffstat (limited to 'generic/tclFileName.c')
-rw-r--r-- | generic/tclFileName.c | 15 |
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; } |