ruby-changes:25269
From: usa <ko1@a...>
Date: Thu, 25 Oct 2012 17:17:13 +0900 (JST)
Subject: [ruby-changes:25269] usa:r37321 (ruby_1_9_3): merge revision(s) 34849,34853,34854,34855,34859,34862,35384,35385,36811,36812,36850,36907,36908: [Backport #7174]
usa 2012-10-25 17:16:34 +0900 (Thu, 25 Oct 2012) New Revision: 37321 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37321 Log: merge revision(s) 34849,34853,34854,34855,34859,34862,35384,35385,36811,36812,36850,36907,36908: [Backport #7174] * Makefile.in (PLATFORM_DIR): add a variable for `win32` directory. * Makefile.in (clean-platform): add new target. It cleans `win32` directory. * common.mk (clean): add a dependency for `win32` directory. * common.mk (distclean): ditto. * common.mk (distclean-platform): add new target. It cleans `win32` directory. * common.mk ($(PLATFORM_D)): add new target to make `win32` directory. * common.mk (win32/win32.$(OBJEXT)): move win32.o into `win32` directory. * common.mk (win32/file.$(OBJEXT)): add new target for win32/file.c. * configure.in: move win32.o into `win32` directory and add win32/file.o to MISSING. * file.c (file_load_ok, rb_file_load_ok): replace static file_load_ok() with public rb_file_load_ok(). It's to link Windows implementation in win32/file.c. * file.c (rb_find_file_ext_safe): ditto. * file.c (rb_find_file_safe): ditto. * win32/file.c (rb_file_load_ok): new file. Add Windows specific optimized implementation of rb_file_load_ok(). We created a separated file to avoid too many #ifdef macro which is unreadable. * win32/Makefile.sub (PLATFORM_DIR): add a variable for `win32` directory. * win32/Makefile.sub (MISSING): move win32.obj into `win32` directory and add win32/file.obj to MISSING. * win32/Makefile.sub (MAKEDIRS): replace MINIRUBY with BASERUBY. It's because miniruby doesn't exist when making `win32` directory. * win32/Makefile.sub (clean-platform): add new target to clean `win32` directory. * win32/Makefile.sub ({$(srcdir)}.c{}.obj): make it not match win32/file.c to build properly. * win32/Makefile.sub (win32/win32.$(OBJEXT)): move win32.obj into `win32` directory. Patch created with Luis Lavena. [ruby-core:42480] [Feature #5999] * win32/Makefile.sub (MAKEDIRS): use mkdir of cmd.exe instead of ruby. [Bug #6103] [ruby-core:43012] * win32/README.win32: added a notice about command extension of cmd.exe. * win32/makedirs.bat: new command to make intermediate directories, and not to report any errors if the directory already exists. * win32/Makefile.sub (MAKEDIRS): enable command extensions. * win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK. * configure.in (mingw): add shlwapi to the list of dependency libs for Windows. * win32/Makefile.sub (EXTSOLIBS): ditto. * internal.h: declare internal functions rb_w32_init_file, rb_file_expand_path_internal and rb_file_expand_path_fast. * file.c (Init_File): invoke Windows initialization rb_w32_init_file * win32/file.c (rb_file_load_path_internal): new function. Windows-specific implementation that replaces file_expand_path. [Bug #6836][ruby-core:46996] * win32/file.c (rb_w32_init_file): new function. Initialize codepage cache for faster conversion encodings lookup. * file.c (file_expand_path): rename to rb_file_expand_path_internal. Conditionally exclude from Windows. * file.c (rb_file_expand_path_fast): new function. delegates to rb_file_expand_path_internal without performing a hit to the filesystem. * file.c (file_expand_path_1): use rb_file_expand_path_internal without path expansion (used by require). * file.c (rb_find_file_ext_safe): ditto. * file.c (rb_find_file_safe): ditto. * load.c (rb_get_expanded_load_path): use rb_file_expand_path_fast. * load.c (rb_feature_provided): ditto. * file.c (rb_file_expand_path): use rb_file_expand_path_internal with path expansion. * file.c (rb_file_absolute_path): ditto. * test/ruby/test_file_exhaustive.rb: new tests to exercise rb_file_expand_path_internal implementation and compliance with existing behaviors. * test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for posix environments where HOME is not defined. [ruby-core:47322] Added files: branches/ruby_1_9_3/win32/file.c branches/ruby_1_9_3/win32/makedirs.bat Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/Makefile.in branches/ruby_1_9_3/common.mk branches/ruby_1_9_3/configure.in branches/ruby_1_9_3/file.c branches/ruby_1_9_3/internal.h branches/ruby_1_9_3/load.c branches/ruby_1_9_3/test/ruby/test_file_exhaustive.rb branches/ruby_1_9_3/version.h branches/ruby_1_9_3/win32/Makefile.sub branches/ruby_1_9_3/win32/README.win32 branches/ruby_1_9_3/win32/rmall.bat Index: ruby_1_9_3/configure.in =================================================================== --- ruby_1_9_3/configure.in (revision 37320) +++ ruby_1_9_3/configure.in (revision 37321) @@ -1060,7 +1060,7 @@ AC_CHECK_FUNCS(cygwin_conv_path) AC_LIBOBJ([langinfo]) ], -[mingw*], [ LIBS="-lshell32 -lws2_32 -limagehlp $LIBS" +[mingw*], [ LIBS="-lshell32 -lws2_32 -limagehlp -lshlwapi $LIBS" ac_cv_header_a_out_h=no ac_cv_header_pwd_h=no ac_cv_header_utime_h=no @@ -2586,11 +2586,13 @@ fi EXPORT_PREFIX=' ' DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)' - AC_LIBOBJ([win32]) + AC_LIBOBJ([win32/win32]) + AC_LIBOBJ([win32/file]) COMMON_LIBS=m # COMMON_MACROS="WIN32_LEAN_AND_MEAN=" COMMON_HEADERS="winsock2.h windows.h" THREAD_MODEL=win32 + PLATFORM_DIR=win32 ]) LIBRUBY_ALIASES='' FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in @@ -2743,6 +2745,7 @@ AC_SUBST(SYMBOL_PREFIX) AC_SUBST(MINIOBJS) AC_SUBST(THREAD_MODEL) +AC_SUBST(PLATFORM_DIR) MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`" MAKEFILES="`echo $MAKEFILES`" Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 37320) +++ ruby_1_9_3/ChangeLog (revision 37321) @@ -1,3 +1,112 @@ +Thu Oct 25 16:59:17 2012 Luis Lavena <luislavena@g...> + + * test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for + posix environments where HOME is not defined. [ruby-core:47322] + +Thu Oct 25 16:59:17 2012 Luis Lavena <luislavena@g...> + + * configure.in (mingw): add shlwapi to the list of dependency + libs for Windows. + * win32/Makefile.sub (EXTSOLIBS): ditto. + + * internal.h: declare internal functions rb_w32_init_file, + rb_file_expand_path_internal and rb_file_expand_path_fast. + + * file.c (Init_File): invoke Windows initialization rb_w32_init_file + + * win32/file.c (rb_file_load_path_internal): new function. + Windows-specific implementation that replaces file_expand_path. + [Bug #6836][ruby-core:46996] + + * win32/file.c (rb_w32_init_file): new function. Initialize codepage + cache for faster conversion encodings lookup. + + * file.c (file_expand_path): rename to rb_file_expand_path_internal. + Conditionally exclude from Windows. + + * file.c (rb_file_expand_path_fast): new function. delegates to + rb_file_expand_path_internal without performing a hit to the + filesystem. + + * file.c (file_expand_path_1): use rb_file_expand_path_internal without + path expansion (used by require). + * file.c (rb_find_file_ext_safe): ditto. + * file.c (rb_find_file_safe): ditto. + + * load.c (rb_get_expanded_load_path): use rb_file_expand_path_fast. + * load.c (rb_feature_provided): ditto. + + * file.c (rb_file_expand_path): use rb_file_expand_path_internal with + path expansion. + * file.c (rb_file_absolute_path): ditto. + + * test/ruby/test_file_exhaustive.rb: new tests to exercise + rb_file_expand_path_internal implementation and compliance with + existing behaviors. + +Thu Oct 25 16:59:17 2012 NAKAMURA Usaku <usa@r...> + + * win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK. + +Thu Oct 25 16:59:17 2012 Nobuyoshi Nakada <nobu@r...> + + * win32/makedirs.bat: new command to make intermediate + directories, and not to report any errors if the directory + already exists. + + * win32/Makefile.sub (MAKEDIRS): enable command extensions. + +Thu Oct 25 16:59:17 2012 NAKAMURA Usaku <usa@r...> + + * win32/Makefile.sub (MAKEDIRS): use mkdir of cmd.exe instead of ruby. + [Bug #6103] [ruby-core:43012] + + * win32/README.win32: added a notice about command extension of cmd.exe. + +Thu Oct 25 16:59:17 2012 Hiroshi Shirosaki <h.shirosaki@g...> + + * Makefile.in (PLATFORM_DIR): add a variable for `win32` directory. + * Makefile.in (clean-platform): add new target. + It cleans `win32` directory. + + * common.mk (clean): add a dependency for `win32` directory. + * common.mk (distclean): ditto. + * common.mk (distclean-platform): add new target. + It cleans `win32` directory. + * common.mk ($(PLATFORM_D)): add new target to make `win32` directory. + * common.mk (win32/win32.$(OBJEXT)): move win32.o into `win32` + directory. + * common.mk (win32/file.$(OBJEXT)): add new target for win32/file.c. + + * configure.in: move win32.o into `win32` directory and add + win32/file.o to MISSING. + + * file.c (file_load_ok, rb_file_load_ok): replace static + file_load_ok() with public rb_file_load_ok(). + It's to link Windows implementation in win32/file.c. + * file.c (rb_find_file_ext_safe): ditto. + * file.c (rb_find_file_safe): ditto. + + * win32/file.c (rb_file_load_ok): new file. Add Windows specific + optimized implementation of rb_file_load_ok(). We created a + separated file to avoid too many #ifdef macro which is unreadable. + + * win32/Makefile.sub (PLATFORM_DIR): add a variable for `win32` + directory. + * win32/Makefile.sub (MISSING): move win32.obj into `win32` + directory and add win32/file.obj to MISSING. + * win32/Makefile.sub (MAKEDIRS): replace MINIRUBY with BASERUBY. + It's because miniruby doesn't exist when making `win32` directory. + * win32/Makefile.sub (clean-platform): add new target to clean `win32` + directory. + * win32/Makefile.sub ({$(srcdir)}.c{}.obj): make it not match + win32/file.c to build properly. + * win32/Makefile.sub (win32/win32.$(OBJEXT)): move win32.obj into + `win32` directory. + + Patch created with Luis Lavena. + [ruby-core:42480] [Feature #5999] + Fri Oct 19 13:28:29 2012 Nobuyoshi Nakada <nobu@r...> * configure.in (opt-dir): allow multiple directories separated by Index: ruby_1_9_3/load.c =================================================================== --- ruby_1_9_3/load.c (revision 37320) +++ ruby_1_9_3/load.c (revision 37321) @@ -43,7 +43,7 @@ ary = rb_ary_new2(RARRAY_LEN(load_path)); for (i = 0; i < RARRAY_LEN(load_path); ++i) { - VALUE path = rb_file_expand_path(RARRAY_PTR(load_path)[i], Qnil); + VALUE path = rb_file_expand_path_fast(RARRAY_PTR(load_path)[i], Qnil); rb_str_freeze(path); rb_ary_push(ary, path); } @@ -233,7 +233,7 @@ if (*feature == '.' && (feature[1] == '/' || strncmp(feature+1, "./", 2) == 0)) { - fullpath = rb_file_expand_path(rb_str_new2(feature), Qnil); + fullpath = rb_file_expand_path_fast(rb_str_new2(feature), Qnil); feature = RSTRING_PTR(fullpath); } if (ext && !strchr(ext, '/')) { Index: ruby_1_9_3/common.mk =================================================================== --- ruby_1_9_3/common.mk (revision 37320) +++ ruby_1_9_3/common.mk (revision 37321) @@ -26,6 +26,7 @@ RBCONFIG = ./.rbconfig.time LIBRUBY_EXTS = ./.libruby-with-ext.time REVISION_H = ./.revision.time +PLATFORM_D = ./$(PLATFORM_DIR)/.time RDOCOUT = $(EXTOUT)/rdoc CAPIOUT = doc/capi ID_H_TARGET = -id.h- @@ -426,7 +427,7 @@ clear-installed-list: PHONY @> $(INSTALLED_LIST) set MAKE="$(MAKE)" -clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout +clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform clean-local:: PHONY @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time @@ -436,10 +437,11 @@ @$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS) clean-rdoc: PHONY clean-capi: PHONY +clean-platform: PHONY clean-extout: PHONY clean-docs: clean-rdoc clean-capi -distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout +distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform distclean-local:: clean-local @$(RM) $(MKFILES) yasmdata.rb *.inc @$(RM) config.cache config.status config.status.lineno $(PRELUDES) @@ -450,6 +452,7 @@ distclean-rdoc: PHONY distclean-capi: PHONY distclean-extout: clean-extout +distclean-platform: clean-platform realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout realclean-local:: distclean-local @@ -573,8 +576,13 @@ ia64.$(OBJEXT): {$(VPATH)}ia64.s $(CC) $(CFLAGS) -c $< -win32.$(OBJEXT): {$(VPATH)}win32.c $(RUBY_H_INCLUDES) +$(PLATFORM_D): + $(Q) $(MAKEDIRS) $(PLATFORM_DIR) + @exit > $@ +win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c $(RUBY_H_INCLUDES) $(PLATFORM_D) +win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D) + ### RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \ Index: ruby_1_9_3/win32/README.win32 =================================================================== --- ruby_1_9_3/win32/README.win32 (revision 37320) +++ ruby_1_9_3/win32/README.win32 (revision 37321) @@ -25,7 +25,11 @@ * sed * ruby 1.8 -(5) If you want built binaries to run on Windows 95 series (including +(5) Enable Command Extension of your command line. It's the default behavior + of cmd.exe. If you want to enable it explicitly, run cmd.exe with /E:ON + option. + +(6) If you want built binaries to run on Windows 95 series (including 98 and Me), you need unicows.lib at compile time, and unicows.dll at run time. Index: ruby_1_9_3/win32/file.c =================================================================== --- ruby_1_9_3/win32/file.c (revision 0) +++ ruby_1_9_3/win32/file.c (revision 37321) @@ -0,0 +1,661 @@ +#include "ruby/ruby.h" +#include "ruby/encoding.h" +#include <winbase.h> +#include <wchar.h> +#include <shlwapi.h> + +#ifndef INVALID_FILE_ATTRIBUTES +# define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +#endif + +/* cache 'encoding name' => 'code page' into a hash */ +static VALUE rb_code_page; + +#define IS_DIR_SEPARATOR_P(c) (c == L'\\' || c == L'/') +#define IS_DIR_UNC_P(c) (IS_DIR_SEPARATOR_P(c[0]) && IS_DIR_SEPARATOR_P(c[1])) + +/* MultiByteToWideChar() doesn't work with code page 51932 */ +#define INVALID_CODE_PAGE 51932 +#define PATH_BUFFER_SIZE MAX_PATH * 2 + +#define insecure_obj_p(obj, level) ((level) >= 4 || ((level) > 0 && OBJ_TAINTED(obj))) + +static inline void +replace_wchar(wchar_t *s, int find, int replace) +{ + while (*s != 0) { + if (*s == find) + *s = replace; + s++; + } +} + +/* Convert str from multibyte char to wchar with specified code page */ +static inline void +convert_mb_to_wchar(VALUE str, wchar_t **wstr, wchar_t **wstr_pos, size_t *wstr_len, UINT code_page) +{ + size_t len; + + if (NIL_P(str)) + return; + + len = MultiByteToWideChar(code_page, 0, RSTRING_PTR(str), -1, NULL, 0) + 1; + *wstr = (wchar_t *)xmalloc(len * sizeof(wchar_t)); + if (wstr_pos) + *wstr_pos = *wstr; + + MultiByteToWideChar(code_page, 0, RSTRING_PTR(str), -1, *wstr, len); + *wstr_len = len - 2; +} + +static inline void +convert_wchar_to_mb(const wchar_t *wstr, char **str, size_t *str_len, UINT code_page) +{ + size_t len; + + len = WideCharToMultiByte(code_page, 0, wstr, -1, NULL, 0, NULL, NULL); + *str = (char *)xmalloc(len * sizeof(char)); + WideCharToMultiByte(code_page, 0, wstr, -1, *str, len, NULL, NULL); + + /* do not count terminator as part of the string length */ + *str_len = len - 1; +} + +/* + Return user's home directory using environment variables combinations. + Memory allocated by this function should be manually freed afterwards. + + Try: + HOME, HOMEDRIVE + HOMEPATH and USERPROFILE environment variables + TODO: Special Folders - Profile and Personal +*/ +static wchar_t * +home_dir(void) +{ + wchar_t *buffer = NULL; + size_t buffer_len = 0, len = 0; + size_t home_env = 0; + + /* + GetEnvironmentVariableW when used with NULL will return the required + buffer size and its terminating character. + http://msdn.microsoft.com/en-us/library/windows/desktop/ms683188(v=vs.85).aspx + */ + + if (len = GetEnvironmentVariableW(L"HOME", NULL, 0)) { + buffer_len = len; + home_env = 1; + } + else if (len = GetEnvironmentVariableW(L"HOMEDRIVE", NULL, 0)) { + buffer_len = len; + if (len = GetEnvironmentVariableW(L"HOMEPATH", NULL, 0)) { + buffer_len += len; + home_env = 2; + } + else { + buffer_len = 0; + } + } + else if (len = GetEnvironmentVariableW(L"USERPROFILE", NULL, 0)) { + buffer_len = len; + home_env = 3; + } + + /* allocate buffer */ + if (home_env) + buffer = (wchar_t *)xmalloc(buffer_len * sizeof(wchar_t)); + + switch (home_env) { + case 1: + /* HOME */ + GetEnvironmentVariableW(L"HOME", buffer, buffer_len); + break; + case 2: + /* HOMEDRIVE + HOMEPATH */ + len = GetEnvironmentVariableW(L"HOMEDRIVE", buffer, buffer_len); + GetEnvironmentVariableW(L"HOMEPATH", buffer + len, buffer_len - len); + break; + case 3: + /* USERPROFILE */ + GetEnvironmentVariableW(L"USERPROFILE", buffer, buffer_len); + break; + default: + break; + } + + if (home_env) { + /* sanitize backslashes with forwardslashes */ + replace_wchar(buffer, L'\\', L'/'); + + return buffer; + } + + return NULL; +} + +/* Remove trailing invalid ':$DATA' of the path. */ +static inline size_t +remove_invalid_alternative_data(wchar_t *wfullpath, size_t size) +{ + static const wchar_t prime[] = L":$DATA"; + enum { prime_len = (sizeof(prime) / sizeof(wchar_t)) -1 }; + + if (size <= prime_len || _wcsnicmp(wfullpath + size - prime_len, prime, prime_len) != 0) + return size; + + /* alias of stream */ + /* get rid of a bug of x64 VC++ */ + if (wfullpath[size - (prime_len + 1)] == ':') { + /* remove trailing '::$DATA' */ + size -= prime_len + 1; /* prime */ + wfullpath[size] = L'\0'; + } + else { + /* remove trailing ':$DATA' of paths like '/aa:a:$DATA' */ + wchar_t *pos = wfullpath + size - (prime_len + 1); + while (!IS_DIR_SEPARATOR_P(*pos) && pos != wfullpath) { + if (*pos == L':') { + size -= prime_len; /* alternative */ + wfullpath[size] = L'\0'; + break; + } + pos--; + } + } + return size; +} + +/* Return system code page. */ +static inline UINT +system_code_page(void) +{ + return AreFileApisANSI() ? CP_ACP : CP_OEMCP; +} + +/* + Return code page number of the encoding. + Cache code page into a hash for performance since finding the code page in + Encoding#names is slow. +*/ +static UINT +code_page(rb_encoding *enc) +{ + VALUE code_page_value, name_key; + VALUE encoding, names_ary = Qundef, name; + char *enc_name; + struct RString fake_str; + ID names; + long i; + + if (!enc) + return system_code_page(); + + enc_name = (char *)rb_enc_name(enc); + + fake_str.basic.flags = T_STRING|RSTRING_NOEMBED; + fake_str.basic.klass = rb_cString; + fake_str.as.heap.len = strlen(enc_name); + fake_str.as.heap.ptr = enc_name; + fake_str.as.heap.aux.capa = fake_str.as.heap.len; + name_key = (VALUE)&fake_str; + ENCODING_CODERANGE_SET(name_key, rb_usascii_encindex(), ENC_CODERANGE_7BIT); + + code_page_value = rb_hash_lookup(rb_code_page, name_key); + if (code_page_value != Qnil) + return (UINT)FIX2INT(code_page_value); + + name_key = rb_usascii_str_new2(enc_name); + + encoding = rb_enc_from_encoding(enc); + if (!NIL_P(encoding)) { + CONST_ID(names, "names"); + names_ary = rb_funcall(encoding, names, 0); + } + + /* map US-ASCII and ASCII-8bit as code page 20127 (us-ascii) */ + if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) { + UINT code_page = 20127; + rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page)); + return code_page; + } + + if (names_ary != Qundef) { + for (i = 0; i < RARRAY_LEN(names_ary); i++) { + name = RARRAY_PTR(names_ary)[i]; + if (strncmp("CP", RSTRING_PTR(name), 2) == 0) { + int code_page = atoi(RSTRING_PTR(name) + 2); + if (code_page != 0) { + rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page)); + return (UINT)code_page; + } + } + } + } + + rb_hash_aset(rb_code_page, name_key, INT2FIX(INVALID_CODE_PAGE)); + return INVALID_CODE_PAGE; +} + +static inline VALUE +fix_string_encoding(VALUE str, rb_encoding *encoding) +{ + VALUE result, tmp; + + tmp = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), encoding); + result = rb_str_encode(tmp, rb_enc_from_encoding(rb_utf8_encoding()), 0, Qnil); + + return result; +} + +/* + Replace the last part of the path to long name. + We try to avoid to call FindFirstFileW() since it takes long time. +*/ +static inline size_t +replace_to_long_name(wchar_t **wfullpath, size_t size, int heap) +{ + WIN32_FIND_DATAW find_data; + HANDLE find_handle; + + /* + Skip long name conversion if the path is already long name. + Short name is 8.3 format. + http://en.wikipedia.org/wiki/8.3_filename + This check can be skipped for directory components that have file + extensions longer than 3 characters, or total lengths longer than + 12 characters. + http://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx + */ + size_t const max_short_name_size = 8 + 1 + 3; + size_t const max_extension_size = 3; + size_t path_len = 1, extension_len = 0; + wchar_t *pos = *wfullpath; + + if (size == 3 && pos[1] == L':' && pos[2] == L'\\' && pos[3] == L'\0') { + /* root path doesn't need short name expansion */ + return size; + } + + pos = *wfullpath + size - 1; + while (!IS_DIR_SEPARATOR_P(*pos) && pos != *wfullpath) { + if (!extension_len && *pos == L'.') { + extension_len = path_len - 1; + } + if (path_len > max_short_name_size || extension_len > max_extension_size) { + return size; + } + path_len++; + pos--; + } + + find_handle = FindFirstFileW(*wfullpath, &find_data); + if (find_handle != INVALID_HANDLE_VALUE) { + size_t trail_pos = wcslen(*wfullpath); + size_t file_len = wcslen(find_data.cFileName); + + FindClose(find_handle); + while (trail_pos > 0) { + if (IS_DIR_SEPARATOR_P((*wfullpath)[trail_pos])) + break; + trail_pos--; + } + size = trail_pos + 1 + file_len; + if ((size + 1) > sizeof(*wfullpath) / sizeof((*wfullpath)[0])) { + wchar_t *buf = (wchar_t *)xmalloc((size + 1) * sizeof(wchar_t)); + wcsncpy(buf, *wfullpath, trail_pos + 1); + if (heap) + xfree(*wfullpath); + *wfullpath = buf; + } + wcsncpy(*wfullpath + trail_pos + 1, find_data.cFileName, file_len + 1); + } + return size; +} + +VALUE +rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_name, VALUE result) +{ + size_t size = 0, wpath_len = 0, wdir_len = 0, whome_len = 0; + size_t buffer_len = 0; + char *fullpath = NULL; + wchar_t *wfullpath = NULL, *wpath = NULL, *wpath_pos = NULL, *wdir = NULL; + wchar_t *whome = NULL, *buffer = NULL, *buffer_pos = NULL; + UINT path_cp, cp; + VALUE path = fname, dir = dname; + wchar_t wfullpath_buffer[PATH_BUFFER_SIZE]; + wchar_t path_drive = L'\0', dir_drive = L'\0'; + int ignore_dir = 0; + rb_encoding *path_encoding; + int tainted = 0; + + /* tainted if path is tainted */ + tainted = OBJ_TAINTED(path); + + /* get path encoding */ + if (NIL_P(dir)) { + path_encoding = rb_enc_get(path); + } + else { + path_encoding = rb_enc_check(path, dir); + } + + cp = path_cp = code_page(path_encoding); + + /* workaround invalid codepage */ + if (path_cp == INVALID_CODE_PAGE) { + cp = CP_UTF8; + if (!NIL_P(path)) { + path = fix_string_encoding(path, path_encoding); + } + } + + /* convert char * to wchar_t */ + convert_mb_to_wchar(path, &wpath, &wpath_pos, &wpath_len, cp); + + /* determine if we need the user's home directory */ + /* expand '~' only if NOT rb_file_absolute_path() where `abs_mode` is 1 */ + if (abs_mode == 0 && wpath_len > 0 && wpath_pos[0] == L'~' && + (wpath_len == 1 || IS_DIR_SEPARATOR_P(wpath_pos[1]))) { + /* tainted if expanding '~' */ + tainted = 1; + + whome = home_dir(); + if (whome == NULL) { + xfree (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/