Add a wrapper for access() when compiling via Visual Studio

Quoted 4 lines · David Sommerseth

+/* The POSIX access() function is called via _access() on Windows,
+ * defined in io.h + */ +#define HAVE_ACCESS 1 +#define access _access +#pragma warning(disable : 4996) /* Avoid Visual Studio to complain about access(), which is redefined */

Where is it defined? Anyway, won't it better: --- #ifdef access #undef access #endif #define access _access ---

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 9 lines · Alon Bar-Lev

Quoted 4 lines · David Sommerseth

+/* The POSIX access() function is called via _access() on Windows,
+ * defined in io.h + */ +#define HAVE_ACCESS 1 +#define access _access +#pragma warning(disable : 4996) /* Avoid Visual Studio to complain about access(), which is redefined */

Where is it defined? Anyway, won't it better: --- #ifdef access #undef access #endif #define access _access ---

I tried that approach as well, and I still got this warning:
- ------------------------------------------------------------------------- options.c(2619) : warning C4996: '_access': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _access. See online help for details.
       c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\INCLUDE\io.h(185): see declaration of '_access' options.c(2625) : warning C4996: '_access': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _access. See online help for details.

Quoted 14 lines · David Sommerseth

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 9 lines · Alon Bar-Lev

Quoted 4 lines · David Sommerseth

+/* The POSIX access() function is called via _access() on Windows,
+ * defined in io.h + */ +#define HAVE_ACCESS 1 +#define access _access +#pragma warning(disable : 4996) /* Avoid Visual Studio to complain about access(), which is redefined */

Where is it defined? Anyway, won't it better: --- #ifdef access #undef access #endif #define access _access ---

Quoted 10 lines

I tried that approach as well, and I still got this warning:
- ------------------------------------------------------------------------- options.c(2619) : warning C4996: '_access': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _access. See online help for details.
       c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\INCLUDE\io.h(185): see declaration of '_access' options.c(2625) : warning C4996: '_access': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _access. See online help for details.

This is something else!
Try defining _CRT_NONSTDC_NO_WARNINGS and _CRT_SECURE_NO_WARNINGS.

Alon.

Quoted 27 lines · Alon Bar-Lev

Quoted 24 lines · David Sommerseth

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 9 lines · Alon Bar-Lev

Quoted 4 lines · David Sommerseth

+/* The POSIX access() function is called via _access() on Windows,
+ * defined in io.h + */ +#define HAVE_ACCESS 1 +#define access _access +#pragma warning(disable : 4996) /* Avoid Visual Studio to complain about access(), which is redefined */

Where is it defined? Anyway, won't it better: --- #ifdef access #undef access #endif #define access _access ---

I tried that approach as well, and I still got this warning:
- ------------------------------------------------------------------------- options.c(2619) : warning C4996: '_access': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _access. See online help for details.
       c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\INCLUDE\io.h(185): see declaration of '_access' options.c(2625) : warning C4996: '_access': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _access. See online help for details.

Quoted 4 lines

This is something else!
Try defining _CRT_NONSTDC_NO_WARNINGS and _CRT_SECURE_NO_WARNINGS.

Alon.

This of course should be only in your vcproj not anywhere in openvpn.

Alon.

Visual Studio does not enable certiain standard Unix functions, such as access().  By defining _CRT_NONSTDC_NO_WARNINGS and _CRT_SECURE_NO_WARNINGS, these functions are enabled.

This patch also adds a ./configure check for access() as well, in case this needs to be implemented on other platforms lacking this feature.  Which is why HAVE_ACCESS is defined in win/config.h.in

Thanks to Alon Bar-Lev for helping solving this.

Signed-off-by David Sommerseth <[email protected]...>

---
 configure.ac    |    2 +-
 options.c       |    1 -
 win/config.h.in |   28 ++++++++++++++++++++++++++++ win/msvc.mak.in |    2 +-

 4 files changed, 30 insertions(+), 3 deletions(-)

configure.ac +0 -0

index 173d6e2..f8b3dd6 100644
@@ -515,7 +515,7 @@ AC_CHECK_FUNCS(daemon chroot getpwnam setuid nice system getpid dup dup2 dnl

              getpass strerror syslog openlog mlockall getgrnam setgid dnl setgroups stat flock readv writev time dnl
              setsid chdir putenv getpeername unlink dnl
-              chsize ftruncate execve getpeereid umask basename dirname)
+              chsize ftruncate execve getpeereid umask basename dirname access)

 # Windows use stdcall for winsock so we cannot auto detect these m4_define([SOCKET_FUNCS], [socket recv recvfrom send sendto listen dnl

options.c +0 -1

index 2280e9b..508fc82 100644
@@ -52,7 +52,6 @@
  #include "configure.h"
  #include "forward.h"
  #include <ctype.h>
-#include <unistd.h>
 
  #include "memdbg.h"
 

win/config.h.in +28 -0

index e9df379..b5c31b8 100644
@@ -223,6 +223,34 @@ typedef unsigned long in_addr_t;
  /* Special Windows version of getpass() defined in io.c */
  #define HAVE_GETPASS 1
 
+
+/* The POSIX access() function is available, but requires
+ * _CRT_NONSTDC_NO_WARNINGS and _CRT_SECURE_NO_WARNINGS
+ * to be defined
+ */
+#define HAVE_ACCESS 1
+
+/* Macros used by the POSIX access() function might not be available on Windows.
+ * Based on information found here:
+ * http://msdn.microsoft.com/en-us/library/1w06ktdy%28v=vs.80%29.aspx
+ */
+#ifndef R_OK
+#define R_OK 4
+#endif
+
+#ifndef W_OK
+#define W_OK 2
+#endif
+
+#ifndef X_OK
+#define X_OK 1
+#endif
+
+#ifndef F_OK
+#define F_OK 0
+#endif
+
+
  /* Define to the full name and version of this package. */
  #ifdef DEBUG_LABEL
  #define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION " " DEBUG_LABEL

win/msvc.mak.in +0 -0

index 26d7a33..115e395 100644
@@ -38,7 +38,7 @@ LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(POLARSSL)\build\library -LIBPATH:$

 EXE = openvpn.exe

 CPP=cl.exe

win/msvc.mak.in +1 -1

-CPP_ARG_COMMON=/nologo /W3 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE $(INCLUDE_DIRS) /FD /c
+CPP_ARG_COMMON=/nologo /W3 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS $(INCLUDE_DIRS) /FD /c

 LINK32=link.exe

--
1.7.4.4

Visual Studio does not enable certiain standard Unix functions, such as access(). By defining _CRT_NONSTDC_NO_WARNINGS and _CRT_SECURE_NO_WARNINGS, these functions are enabled.

This patch also adds a ./configure check for access() as well, in case this needs to be implemented on other platforms lacking this feature. Which is why HAVE_ACCESS is defined in win/config.h.in

Thanks to Alon Bar-Lev for helping solving this.

Signed-off-by David Sommerseth <[email protected]...> --- configure.ac |

2 +- options.c | 1 - win/config.h.in | 28
++++++++++++++++++++++++++++ win/msvc.mak.in | 2 +- 4 files
changed, 30 insertions(+), 3 deletions(-)

This kicks out the openvpn_basename() function from misc.[ch] andputs it into compat.[ch]. This is to provide the same functionality on platforms not having a native basename() function available.

In addition this patch adds dirname() which commit 0f2bc0dd92f43c91e depends. Without dirname(), openvpn won't build in Visual Studio.

v2: Move all functions from compat.h to compat.c

Signed-off-by David Sommerseth <[email protected]...> --- Makefile.am |

1 + compat.c | 82
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ compat.h

|   42 +++++++++++++++++++++++++++++ configure.ac |    2 +- init.c
|    6 +++- misc.c       |   23 ++-------------- misc.h       |    3
-- options.c    |    1 - syshead.h    |    2 + 9 files changed, 135

insertions(+), 27 deletions(-) create mode 100644 compat.c create mode 100644 compat.h

Visual Studio does not enable certiain standard Unix functions, such as access(). By defining _CRT_NONSTDC_NO_WARNINGS and _CRT_SECURE_NO_WARNINGS, these functions are enabled.

This patch also adds a ./configure check for access() as well, in case this needs to be implemented on other platforms lacking this feature. Which is why HAVE_ACCESS is defined in win/config.h.in

Thanks to Alon Bar-Lev for helping solving this.

This adds the access() function as a wrapper for _access() to be able to compile OpenVPN via Visual Studio. It also adds the required macros which used in POSIX environments (R_OK, W_OK, X_OK, F_OK).