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/sys | |
| 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/sys')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 8015e8f378..a78dbf64af 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1997-2012. All Rights Reserved. + * Copyright Ericsson AB 1997-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -60,16 +60,18 @@ #include <windows.h> #undef WIN32_LEAN_AND_MEAN -/* - * Define MAXPATHLEN in terms of MAXPATH if available. - */ - -#ifndef MAXPATH -#define MAXPATH MAX_PATH -#endif /* MAXPATH */ #ifndef MAXPATHLEN -#define MAXPATHLEN MAXPATH +#define MAXPATHLEN 4096 +/* + erts-6.0 (OTP 17.0): + We now accept windows paths longer than 260 (MAX_PATH) by conversion to + UNC path format. In order to also return long paths from the driver we + increased MAXPATHLEN from 260 to larger (but arbitrary) value 4096. + It would of course be nicer to instead dynamically allocate large enough + tmp buffers when efile_drv needs to return really long paths, and do that + for unix as well. + */ #endif /* MAXPATHLEN */ /* |