diff options
| author | dgp <dgp@users.sourceforge.net> | 2002-02-08 02:52:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2002-02-08 02:52:54 (GMT) |
| commit | 699c1642cb20fb2195b33c4fd04a2ec582507776 (patch) | |
| tree | 078abed0538e74a4b78aa55d46462fe102978f63 /unix/tclUnixFile.c | |
| parent | c11c702cfe6d98893a8ac09baefbf98a868f6b32 (diff) | |
| download | tcl-699c1642cb20fb2195b33c4fd04a2ec582507776.zip tcl-699c1642cb20fb2195b33c4fd04a2ec582507776.tar.gz tcl-699c1642cb20fb2195b33c4fd04a2ec582507776.tar.bz2 | |
* Partial TIP 27 rollback. Following routines
restored to return (char *): Tcl_DStringAppend,
Tcl_DStringAppendElement, Tcl_JoinPath, Tcl_TranslateFileName,
Tcl_ExternalToUtfDString, Tcl_UtfToExternalDString,
Tcl_UniCharToUtfDString, Tcl_GetCwd, Tcl_WinTCharToUtf. Also
restored Tcl_WinUtfToTChar to return (TCHAR *) and
Tcl_UtfToUniCharDString to return (Tcl_UniChar *). Modified
some callers. This change recognizes that Tcl_DStrings are
de-facto white-box objects.
* generic/tclCmdMZ.c: corrected use of C++-style comment.
Diffstat (limited to 'unix/tclUnixFile.c')
| -rw-r--r-- | unix/tclUnixFile.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 031ece8..fc8fb08 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixFile.c,v 1.15 2002/01/25 20:40:56 dgp Exp $ + * RCS: @(#) $Id: tclUnixFile.c,v 1.16 2002/02/08 02:52:54 dgp Exp $ */ #include "tclInt.h" @@ -234,8 +234,7 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types) dirName = Tcl_DStringValue(&dsOrig); /* Make sure we have a trailing directory delimiter */ if (dirName[baseLength-1] != '/') { - Tcl_DStringAppend(&dsOrig, "/", 1); - dirName = Tcl_DStringValue(&dsOrig); + dirName = Tcl_DStringAppend(&dsOrig, "/", 1); baseLength++; } } @@ -333,8 +332,7 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types) struct stat buf; char *nativeEntry; Tcl_DStringSetLength(&ds, nativeDirLen); - Tcl_DStringAppend(&ds, entryPtr->d_name, -1); - nativeEntry = Tcl_DStringValue(&ds); + nativeEntry = Tcl_DStringAppend(&ds, entryPtr->d_name, -1); /* * The native name of the file is in entryPtr->d_name. * We can use this below. |