aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-03-18 16:02:56 +0100
committerSverker Eriksson <[email protected]>2014-03-24 21:09:50 +0100
commit09635c1b75a3659f05704dcebe5ed813f75b5ceb (patch)
tree9458995a6ed3896ec7222f7de0fa4b80c79f6867
parent3700d457197ae91ba75248d19716005c4013c177 (diff)
downloadotp-09635c1b75a3659f05704dcebe5ed813f75b5ceb.tar.gz
otp-09635c1b75a3659f05704dcebe5ed813f75b5ceb.tar.bz2
otp-09635c1b75a3659f05704dcebe5ed813f75b5ceb.zip
erts: Increase MAXPATHLEN to 4096 for windows
-rw-r--r--erts/emulator/sys/win32/erl_win_sys.h20
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 0deb097b1a..14db52476a 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 */
/*