Bugfix for DIRWALK shows inconsistend path separator in Windows

Author: Joe7M

src/common/blib_db.c

@@ -781,7 +781,8 @@ void join_path(char *path, char *ext) {
   int len = strlen(path);
   if (path[len - 1] != OS_DIRSEP) {
     if (ext[0] != OS_DIRSEP) {
-      strcat(path, "/");
+      char ch[] = {OS_DIRSEP, '\0'};
+      strcat(path, ch);
       strcat(path, ext);
     } else {
       strcat(path, ext);
@@ -793,6 +794,11 @@ void join_path(char *path, char *ext) {
       strcat(path, ext + 1);
     }
   }
+  // don't end with trailing slash
+  len = strlen(path);
+  if (path[len - 1] == OS_DIRSEP) {
+    path[len - 1] = '\0';
+  }
 }
 
 /*

src/common/brun.c

@@ -287,11 +287,6 @@ void exec_setup_predefined_variables() {
       *p = '\0';
     }
   }
-  for (char *p = homedir; *p; p++) {
-    if (*p == '\\') {
-      *p = '/';
-    }
-  }
 #elif defined(_UnixOS)
   if (getenv("HOME")) {
     strlcpy(homedir, getenv("HOME"), sizeof(homedir));

src/common/file.c

@@ -674,13 +674,6 @@ char *dev_getcwd() {
     retbuf[l] = OS_DIRSEP;
     retbuf[l + 1] = '\0';
   }
-#if defined(_Win32)
-  for (int i = 0; i < l; i++) {
-    if (retbuf[i] == '\\') {
-      retbuf[i] = OS_DIRSEP;
-    }
-  }
-#endif
   return retbuf;
 }
 

src/common/sys.h

@@ -50,14 +50,15 @@ extern "C" {
 #define OS_PATHNAME_SIZE    1024
 #define OS_FILENAME_SIZE    256
 #define OS_FILEHANDLES      256
-#define OS_DIRSEP   '/'
 
 #if defined(_Win32)
  #define SB_VERSYS "Win"
  #define OS_LINESEPARATOR  "\r\n"
+ #define OS_DIRSEP '\\'
 #else
  #define SB_VERSYS "Unix"
  #define OS_LINESEPARATOR  "\n"
+ #define OS_DIRSEP '/'
 #endif
 
 #define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)