diff options
author | Sverker Eriksson <[email protected]> | 2014-03-24 21:13:44 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-03-24 21:13:44 +0100 |
commit | d2725ed41a16fcc828f0e1af77da2798404f0bdb (patch) | |
tree | 0ed43bf6d2b584cb7b1e4d7cdd0fdea102668955 /erts/emulator/drivers/common | |
parent | 8ffbf0feccb375afc10ce676070b6b778e9bf260 (diff) | |
parent | 293543db1ca5fc17a24e7dc2562d376ea186b009 (diff) | |
download | otp-d2725ed41a16fcc828f0e1af77da2798404f0bdb.tar.gz otp-d2725ed41a16fcc828f0e1af77da2798404f0bdb.tar.bz2 otp-d2725ed41a16fcc828f0e1af77da2798404f0bdb.zip |
Merge branch 'sverk/win-long-filenames/OTP-11813'
* sverk/win-long-filenames/OTP-11813:
erts: Cleanup debug tracing in win_efile.c
erts: Fix file:list_dir for windows paths 258 or 259 chars long
erts: Increase MAXPATHLEN to 4096 for windows
erts: Fix bug in efile_readlink for long win paths
kernel: Fix failed tests in prim_file_SUITE for windows
erts: Fix compiler warning in win_efile.c
erts: Skip tests of paths longer than 255 characters as atoms
erts: Skip tests of file:set_cwd for too long path on Windows
erts: Make file:make_symlink/2 return {error,eperm} on Windows
erts: Revert file:set_cwd impl for windows
erts: Ignore reduntant slashes in windows paths
fix file_SUITE:cur_dir_0 for long windows paths
erts: Fix file_SUITE:make_del_dir for long paths
erts: Fix long windows paths for compressed files
erts: Use GetFullPathNameW to construct abs paths from relative ones
erts: Fix file driver to handle long paths on windows
Conflicts:
erts/emulator/drivers/win32/win_efile.c
Diffstat (limited to 'erts/emulator/drivers/common')
-rw-r--r-- | erts/emulator/drivers/common/gzio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c index ef539f8f9b..1ef1602ec9 100644 --- a/erts/emulator/drivers/common/gzio.c +++ b/erts/emulator/drivers/common/gzio.c @@ -230,6 +230,7 @@ local ErtsGzFile gz_open (path, mode) errno = 0; #if defined(FILENAMES_16BIT) { + FILE* efile_wfopen(const WCHAR* name, const WCHAR* mode); WCHAR wfmode[80]; int i = 0; int j; @@ -237,7 +238,7 @@ local ErtsGzFile gz_open (path, mode) wfmode[i++] = (WCHAR) fmode[j]; } wfmode[i++] = L'\0'; - s->file = _wfopen((WCHAR *)path, wfmode); + s->file = efile_wfopen((WCHAR *)path, wfmode); if (s->file == NULL) { return s->destroy(s), (ErtsGzFile)Z_NULL; } |