diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-02-04 22:45:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-02-04 22:45:59 (GMT) |
| commit | b203ab7aabea8ebece5250e15db03f9c6f96c2b6 (patch) | |
| tree | 431a3e4a40b1c759ee826f2954fb7ac70838c3a5 /unix/tclUnixFile.c | |
| parent | e9034f37542010a9dfeb054699ce1c9e74169f59 (diff) | |
| parent | eee14742522aed25744851879c80a96134de7369 (diff) | |
| download | tcl-b203ab7aabea8ebece5250e15db03f9c6f96c2b6.zip tcl-b203ab7aabea8ebece5250e15db03f9c6f96c2b6.tar.gz tcl-b203ab7aabea8ebece5250e15db03f9c6f96c2b6.tar.bz2 | |
Merge trunk
Diffstat (limited to 'unix/tclUnixFile.c')
| -rw-r--r-- | unix/tclUnixFile.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 3da84e0..352c04e 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -269,8 +269,7 @@ TclpMatchInDirectory( Tcl_DString dsOrig; /* utf-8 encoding of dir */ Tcl_DStringInit(&dsOrig); - dirName = TclGetString(fileNamePtr); - dirLength = fileNamePtr->length; + dirName = TclGetStringFromObj(fileNamePtr, &dirLength); Tcl_DStringAppend(&dsOrig, dirName, dirLength); /* @@ -940,6 +939,7 @@ TclpObjLink( if (linkAction & TCL_CREATE_SYMBOLIC_LINK) { Tcl_DString ds; Tcl_Obj *transPtr; + size_t length; /* * Now we don't want to link to the absolute, normalized path. @@ -951,8 +951,8 @@ TclpObjLink( if (transPtr == NULL) { return NULL; } - target = TclGetString(transPtr); - target = Tcl_UtfToExternalDString(NULL, target, transPtr->length, &ds); + target = TclGetStringFromObj(transPtr, &length); + target = Tcl_UtfToExternalDString(NULL, target, length, &ds); Tcl_DecrRefCount(transPtr); if (symlink(target, src) != 0) { @@ -1105,8 +1105,7 @@ TclNativeCreateNativeRep( Tcl_IncrRefCount(validPathPtr); } - str = TclGetString(validPathPtr); - len = validPathPtr->length; + str = TclGetStringFromObj(validPathPtr, &len); Tcl_UtfToExternalDString(NULL, str, len, &ds); len = Tcl_DStringLength(&ds) + sizeof(char); if (strlen(Tcl_DStringValue(&ds)) < len - sizeof(char)) { |