diff options
| author | hobbs <hobbs> | 2000-01-26 03:37:40 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2000-01-26 03:37:40 (GMT) |
| commit | 3eb5dfa1d24599dedc834f002282d654e757b552 (patch) | |
| tree | bd7431bafb7dd513d0d3ef639da18cf478ec87e4 /generic/tclFileName.c | |
| parent | 04bd0d9f87302a0c6dfcf3641cee54bc29c3f223 (diff) | |
| download | tcl-3eb5dfa1d24599dedc834f002282d654e757b552.zip tcl-3eb5dfa1d24599dedc834f002282d654e757b552.tar.gz tcl-3eb5dfa1d24599dedc834f002282d654e757b552.tar.bz2 | |
* generic/tclClock.c (FormatClock): inlined resultPtr, as it
conflicted with var creation for HAVE_TZSET #def [Bug: 4063]
* generic/tclCmdIL.c (Tcl_LsortObjCmd): fixed potential leak
when calling lsort -command with bad command [Bug: 4067]
* generic/tclFileName.c (Tcl_JoinPath): added support for special
QNX node id prefixes in pathnames [Bug: 4053]
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index d1d9c65..f9f1a7c 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.9 2000/01/24 02:29:58 hobbs Exp $ + * RCS: @(#) $Id: tclFileName.c,v 1.10 2000/01/26 03:37:41 hobbs Exp $ */ #include "tclInt.h" @@ -762,6 +762,15 @@ Tcl_JoinPath(argc, argv, resultPtr) * beginning of the path. */ +#ifdef __QNX__ + /* + * Check for QNX //<node id> prefix + */ + if (*p && (strlen(p) > 3) && + (p[0] == '/') && (p[1] == '/') && atoi(&p[2])) { + p += 3; + } +#endif if (*p == '/') { Tcl_DStringSetLength(resultPtr, oldLength); Tcl_DStringAppend(resultPtr, "/", 1); |