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 /win/tclWinFCmd.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 'win/tclWinFCmd.c')
-rw-r--r-- | win/tclWinFCmd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index dc1ed7b..725f4cf 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.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: tclWinFCmd.c,v 1.21 2002/01/31 21:07:32 uid37547 Exp $ + * RCS: @(#) $Id: tclWinFCmd.c,v 1.22 2002/02/08 02:52:55 dgp Exp $ */ #include "tclWinInt.h" @@ -1407,9 +1407,8 @@ ConvertFileNameFormat( */ Tcl_DStringInit(&ds); tempString = Tcl_GetStringFromObj(tempPath,&tempLen); - Tcl_WinUtfToTChar(tempString, tempLen, &ds); + nativeName = Tcl_WinUtfToTChar(tempString, tempLen, &ds); Tcl_DecrRefCount(tempPath); - nativeName = Tcl_DStringValue(&ds); handle = (*tclWinProcs->findFirstFileProc)(nativeName, &data); if (handle == INVALID_HANDLE_VALUE) { /* |