refactor PATH_SEP into a cmake define

openziti · Aug 23, 2024 · d5a2702 · d5a2702
1 parent 9a2b17e
commit d5a2702
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@ compile_commands.json
 /docker/*.json
 /docker/*.json.orig
 
-.run
+.run
+CMakeFiles/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,11 @@ message("tunnel only = ${TUNNEL_SDK_ONLY}")
 option(EXCLUDE_PROGRAMS "exclude building the programs directory" OFF)
 message("exclude programs = ${EXCLUDE_PROGRAMS}")
 
+if (WIN32)
+    add_compile_definitions(PATH_SEP="\\\\")
+else()
+    add_compile_definitions(PATH_SEP="/")
+endif()
 
 find_package(Git)
 if(NOT GIT_VERSION AND GIT_FOUND)

diff --git a/programs/ziti-edge-tunnel/instance.c b/programs/ziti-edge-tunnel/instance.c
@@ -25,12 +25,6 @@
 #define MIN_API_PAGESIZE 10
 #define DEFAULT_API_PAGESIZE 25
 
-#if _WIN32
-#define PATH_SEP '\\'
-#else
-#define PATH_SEP '/'
-#endif
-
 model_map tnl_identity_map = {0};
 static const char* CFG_INTERCEPT_V1 = "intercept.v1";
 static const char* CFG_HOST_V1 = "host.v1";

diff --git a/programs/ziti-edge-tunnel/windows/log_utils.c b/programs/ziti-edge-tunnel/windows/log_utils.c
@@ -25,12 +25,6 @@
 #include "windows/windows-scripts.h"
 #include <direct.h>
 
-#if _WIN32
-#define PATH_SEP "\\"
-#else
-#define PATH_SEP "/"
-#endif
-
 
 static bool open_log(char* log_filename);
 static bool rotate_log();

diff --git a/programs/ziti-edge-tunnel/ziti-edge-tunnel.c b/programs/ziti-edge-tunnel/ziti-edge-tunnel.c
@@ -84,10 +84,8 @@ static tunneler_context initialize_tunneler(netif_driver tun, uv_loop_t* ziti_lo
 #if _WIN32
 static void move_config_from_previous_windows_backup(uv_loop_t *loop);
 #define LAST_CHAR_IPC_CMD '\n'
-#define PATH_SEP "\\"
 #else
 #define LAST_CHAR_IPC_CMD '\0'
-#define PATH_SEP "/"
 #endif
 
 struct ipc_cmd_s {