diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-29 07:23:07 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-29 07:23:07 (GMT) |
| commit | 42e171af9f7d955cce861026cfccd61e950256e3 (patch) | |
| tree | 1260f679767f5188f8a2b40b8f1f2953f8cd0417 /unix/tclUnixFile.c | |
| parent | 6dc349d4991d4514c4419c39e9918cf4c7998cfd (diff) | |
| parent | 4afd3525b5e7ea01272b07281dd65833bdb885d7 (diff) | |
| download | tcl-42e171af9f7d955cce861026cfccd61e950256e3.zip tcl-42e171af9f7d955cce861026cfccd61e950256e3.tar.gz tcl-42e171af9f7d955cce861026cfccd61e950256e3.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixFile.c')
| -rw-r--r-- | unix/tclUnixFile.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index b4a1012..a4426b7 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -39,6 +39,7 @@ TclpFindExecutable( const char *argv0) /* The value of the application's argv[0] * (native). */ { + Tcl_Encoding encoding; #ifdef __CYGWIN__ int length; char buf[PATH_MAX * TCL_UTF_MAX + 1]; @@ -46,9 +47,9 @@ TclpFindExecutable( /* Make some symbols available without including <windows.h> */ # define CP_UTF8 65001 - extern int cygwin_conv_to_full_posix_path(const char *, char *); - extern __stdcall int GetModuleFileNameW(void *, const char *, int); - extern __stdcall int WideCharToMultiByte(int, int, const char *, int, + DLLIMPORT extern int cygwin_conv_to_full_posix_path(const char *, char *); + DLLIMPORT extern __stdcall int GetModuleFileNameW(void *, const char *, int); + DLLIMPORT extern __stdcall int WideCharToMultiByte(int, int, const char *, int, const char *, int, const char *, const char *); GetModuleFileNameW(NULL, name, PATH_MAX); @@ -59,13 +60,13 @@ TclpFindExecutable( /* Strip '.exe' part. */ length -= 4; } + encoding = Tcl_GetEncoding(NULL, NULL); TclSetObjNameOfExecutable( - Tcl_NewStringObj(name, length), Tcl_GetEncoding(NULL, NULL)); + Tcl_NewStringObj(name, length), encoding); #else const char *name, *p; Tcl_StatBuf statBuf; Tcl_DString buffer, nameString, cwd, utfName; - Tcl_Encoding encoding; if (argv0 == NULL) { return; |