[Openvpn-devel,v2,5/6] Replace OS_SPECIFIC_DIRSEP with PATH_SEPARATOR

Message ID 20210422152939.2134046-5-arne@rfc2549.org
State Accepted
Headers show
Series
  • [Openvpn-devel,v2,1/6] Avoid failing_test unused warning in example_test
Related show

Commit Message

Arne Schwabe April 22, 2021, 3:29 p.m.
We have two define that do exactly the same. Also move the check
from configure.ac to syshead.h since it is really only checking
for Windows.

Patch V2: Also remove from config-msvc.h

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 config-msvc.h            | 3 ---
 configure.ac             | 8 --------
 src/openvpn/platform.c   | 2 +-
 src/openvpn/ssl_verify.c | 2 +-
 src/openvpn/syshead.h    | 6 ++++--
 5 files changed, 6 insertions(+), 15 deletions(-)

Comments

Gert Doering May 3, 2021, 6:53 a.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

I have not actually tested it (only test compiled on the unix zoo and
MinGW), but it looks very reasonable.

Your patch has been applied to the master branch.

commit d4c1a453c2084fa09baeee58cda0a9823e0b5038
Author: Arne Schwabe
Date:   Thu Apr 22 17:29:38 2021 +0200

     Replace OS_SPECIFIC_DIRSEP with PATH_SEPARATOR

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20210422152939.2134046-5-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22203.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/config-msvc.h b/config-msvc.h
index e73dd8c6f..979232282 100644
--- a/config-msvc.h
+++ b/config-msvc.h
@@ -80,9 +80,6 @@ 
 #define HAVE_EVP_CIPHER_CTX_RESET 1
 #define HAVE_DIINSTALLDEVICE 1
 
-#define PATH_SEPARATOR     '\\'
-#define PATH_SEPARATOR_STR "\\"
-
 #ifndef __cplusplus
 #define inline __inline
 #endif
diff --git a/configure.ac b/configure.ac
index a67bf2595..3b4d3cbc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1133,14 +1133,6 @@  if test -n "${GIT}" -a -d "${srcdir}/.git"; then
 fi
 AC_MSG_RESULT([${GIT_CHECKOUT}])
 
-if test -n "${SP_PLATFORM_WINDOWS}"; then
-	AC_DEFINE_UNQUOTED([PATH_SEPARATOR], ['\\\\'], [Path separator]) #"
-	AC_DEFINE_UNQUOTED([PATH_SEPARATOR_STR], ["\\\\"], [Path separator]) #"
-else
-	AC_DEFINE_UNQUOTED([PATH_SEPARATOR], ['/'], [Path separator])
-	AC_DEFINE_UNQUOTED([PATH_SEPARATOR_STR], ["/"], [Path separator])
-fi
-
 dnl enable --x509-username-field feature if requested
 if test "${enable_x509_alt_username}" = "yes"; then
 	if test "${with_crypto_library}" = "mbedtls" ; then
diff --git a/src/openvpn/platform.c b/src/openvpn/platform.c
index c63c1d994..bf7b1aa0a 100644
--- a/src/openvpn/platform.c
+++ b/src/openvpn/platform.c
@@ -486,7 +486,7 @@  platform_gen_path(const char *directory, const char *filename,
         struct buffer out = alloc_buf_gc(outsize, gc);
         char dirsep[2];
 
-        dirsep[0] = OS_SPECIFIC_DIRSEP;
+        dirsep[0] = PATH_SEPARATOR;
         dirsep[1] = '\0';
 
         if (directory)
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index 7608155cd..14aaf2bf7 100644
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -616,7 +616,7 @@  verify_check_crl_dir(const char *crl_dir, openvpn_x509_cert_t *cert,
         goto cleanup;
     }
 
-    if (!openvpn_snprintf(fn, sizeof(fn), "%s%c%s", crl_dir, OS_SPECIFIC_DIRSEP, serial))
+    if (!openvpn_snprintf(fn, sizeof(fn), "%s%c%s", crl_dir, PATH_SEPARATOR, serial))
     {
         msg(D_HANDSHAKE, "VERIFY CRL: filename overflow");
         goto cleanup;
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 3f2e563b7..bc628eac4 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -436,9 +436,11 @@  typedef unsigned short sa_family_t;
  * Directory separation char
  */
 #ifdef _WIN32
-#define OS_SPECIFIC_DIRSEP '\\'
+#define PATH_SEPARATOR '\\'
+#define PATH_SEPARATOR_STR "\\"
 #else
-#define OS_SPECIFIC_DIRSEP '/'
+#define PATH_SEPARATOR '/'
+#define PATH_SEPARATOR_STR "/"
 #endif
 
 /*