FS-4099 --resolve switch windows to use posix delimiter (/) for base paths. This will correct numerous problems with escaped chars. This change only effects windows builds. Please test.
This commit is contained in:
parent
dd4a995b34
commit
e22f42334d
|
@ -113,7 +113,7 @@ SWITCH_BEGIN_EXTERN_C
|
|||
#define SWITCH_MAX_DTMF_DURATION 192000
|
||||
#define SWITCH_DEFAULT_DIR_PERMS SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_UEXECUTE | SWITCH_FPROT_GREAD | SWITCH_FPROT_GEXECUTE
|
||||
#ifdef WIN32
|
||||
#define SWITCH_PATH_SEPARATOR "\\"
|
||||
#define SWITCH_PATH_SEPARATOR "/"
|
||||
#else
|
||||
#define SWITCH_PATH_SEPARATOR "/"
|
||||
#endif
|
||||
|
|
|
@ -520,12 +520,16 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
|
|||
DWORD dwBufSize = BUFSIZE;
|
||||
char base_dir[1024];
|
||||
char *lastbacklash;
|
||||
char *tmp;
|
||||
|
||||
GetModuleFileName(NULL, base_dir, BUFSIZE);
|
||||
lastbacklash = strrchr(base_dir, '\\');
|
||||
base_dir[(lastbacklash - base_dir)] = '\0';
|
||||
/* set base_dir as cwd, to be able to use relative paths in scripting languages (e.g. mod_lua) when FS is running as a service or while debugging FS using visual studio */
|
||||
SetCurrentDirectory(base_dir);
|
||||
tmp = switch_string_replace(base_dir, "\\", "/");
|
||||
strcpy(base_dir, tmp);
|
||||
free(tmp);
|
||||
|
||||
#else
|
||||
char base_dir[1024] = SWITCH_PREFIX_DIR;
|
||||
|
|
|
@ -3076,7 +3076,7 @@ done:
|
|||
#define RANGE '-'
|
||||
#define RBRACKET ']'
|
||||
#define SEP '/'
|
||||
#define WIN_SEP '\\'
|
||||
#define WIN_SEP '/'
|
||||
#define STAR '*'
|
||||
#define TILDE '~'
|
||||
#define UNDERSCORE '_'
|
||||
|
|
Loading…
Reference in New Issue