alex/zero-epwing-go
1
Fork 0
Code Releases Activity

Fixes for windows

Browse Source
This commit is contained in:
Alex Yatskov 2021-01-10 17:03:06 -08:00
parent cdd6f9e1a9
commit 2b31c3d779
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
filename.c
View File

@ -31,6 +31,10 @@
#include "error.h" #include "error.h"
#include "build-post.h" #include "build-post.h"
#ifdef WIN32
#include <direct.h>
#endif
#ifndef WIN32 #ifndef WIN32
/* /*
@ -119,7 +123,7 @@ eb_canonicalize_path_name(char *path_name)
* `path_name' is a relative path. * `path_name' is a relative path.
* Covert the path name to an absolute path. * Covert the path name to an absolute path.
*/ */
if (getdcwd(ASCII_TOUPPER(*path_name) - 'A' + 1, cwd, if (_getdcwd(ASCII_TOUPPER(*path_name) - 'A' + 1, cwd,
EB_MAX_PATH_LENGTH + 1) == NULL) { EB_MAX_PATH_LENGTH + 1) == NULL) {
return EB_ERR_FAIL_GETCWD; return EB_ERR_FAIL_GETCWD;
} }
@ -278,9 +282,6 @@ eb_fix_path_name_suffix(char *path_name, const char *suffix)
#ifndef WIN32 #ifndef WIN32
base_name = strrchr(path_name, '/'); base_name = strrchr(path_name, '/');
#else #else
if (is_ebnet_url(path_name))
base_name = strrchr(path_name, '/');
else
base_name = strrchr(path_name, '\\'); base_name = strrchr(path_name, '\\');
#endif #endif
if (base_name == NULL) if (base_name == NULL)
@ -491,9 +492,7 @@ eb_compose_path_name(const char *path_name, const char *file_name,
else else
sprintf(composed_path_name, "%s/%s", path_name, file_name); sprintf(composed_path_name, "%s/%s", path_name, file_name);
#else #else
if (is_ebnet_url(path_name)) if (ASCII_ISALPHA(*path_name) && strcmp(path_name + 1, ":\\") == 0)
sprintf(composed_path_name, "%s/%s", path_name, file_name);
else if (ASCII_ISALPHA(*path_name) && strcmp(path_name + 1, ":\\") == 0)
sprintf(composed_path_name, "%s%s", path_name, file_name); sprintf(composed_path_name, "%s%s", path_name, file_name);
else else
sprintf(composed_path_name, "%s\\%s", path_name, file_name); sprintf(composed_path_name, "%s\\%s", path_name, file_name);
@ -519,10 +518,7 @@ eb_compose_path_name2(const char *path_name, const char *sub_directory_name,
path_name, sub_directory_name, file_name); path_name, sub_directory_name, file_name);
} }
#else #else
if (is_ebnet_url(path_name)) { if (ASCII_ISALPHA(*path_name)
sprintf(composed_path_name, "%s/%s/%s",
path_name, sub_directory_name, file_name);
} else if (ASCII_ISALPHA(*path_name)
&& strcmp(path_name + 1, ":\\") == 0) { && strcmp(path_name + 1, ":\\") == 0) {
sprintf(composed_path_name, "%s%s\\%s", sprintf(composed_path_name, "%s%s\\%s",
path_name, sub_directory_name, file_name); path_name, sub_directory_name, file_name);
@ -553,10 +549,7 @@ eb_compose_path_name3(const char *path_name, const char *sub_directory_name,
path_name, sub_directory_name, sub2_directory_name, file_name); path_name, sub_directory_name, sub2_directory_name, file_name);
} }
#else #else
if (is_ebnet_url(path_name)) { if (ASCII_ISALPHA(*path_name)
sprintf(composed_path_name, "%s/%s/%s/%s",
path_name, sub_directory_name, sub2_directory_name, file_name);
} else if (ASCII_ISALPHA(*path_name)
&& strcmp(path_name + 1, ":\\") == 0) { && strcmp(path_name + 1, ":\\") == 0) {
sprintf(composed_path_name, "%s%s\\%s\\%s", sprintf(composed_path_name, "%s%s\\%s\\%s",
path_name, sub_directory_name, sub2_directory_name, file_name); path_name, sub_directory_name, sub2_directory_name, file_name);
@ -737,9 +730,6 @@ eb_path_name_zio_code(const char *path_name, Zio_Code default_zio_code,
#ifndef WIN32 #ifndef WIN32
base_name = strrchr(path_name, '/'); base_name = strrchr(path_name, '/');
#else #else
if (is_ebnet_url(path_name))
base_name = strrchr(path_name, '/');
else
base_name = strrchr(path_name, '\\'); base_name = strrchr(path_name, '\\');
#endif #endif
if (base_name != NULL) if (base_name != NULL)