From 568fee5e74093838121ea61ec15d98a111306bba Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 11 Oct 2014 11:08:52 +0200 Subject: Added proc_self_dirname() for win32 --- kernel/yosys.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kernel/yosys.cc b/kernel/yosys.cc index f2492555..921f2b38 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -28,6 +28,10 @@ # include #endif +#ifdef _WIN32 +# include +#endif + #include #include #include @@ -310,7 +314,7 @@ struct TclPass : public Pass { #if defined(__linux__) std::string proc_self_dirname() { - char path [PATH_MAX]; + char path[PATH_MAX]; ssize_t buflen = readlink("/proc/self/exe", path, sizeof(path)); if (buflen < 0) { log_error("readlink(\"/proc/self/exe\") failed: %s\n", strerror(errno)); @@ -323,7 +327,7 @@ std::string proc_self_dirname() #include std::string proc_self_dirname() { - char * path = NULL; + char *path = NULL; uint32_t buflen = 0; while (_NSGetExecutablePath(path, &buflen) != 0) path = (char *) realloc((void *) path, buflen); @@ -334,8 +338,12 @@ std::string proc_self_dirname() #elif defined(_WIN32) std::string proc_self_dirname() { - #warning Fixme: Implement proc_self_dirname() for win32. - log_error("proc_self_dirname() is not implemented for win32 yet!\n"); + char path[MAX_PATH+1]; + if (!GetModuleFileName(0, path, MAX_PATH+1)) + log_error("GetModuleFileName() failed.\n"); + for (int i = strlen(path)-1; i >= 0 && path[i] != '/' && path[i] != '\\' ; i--) + path[i] = 0; + return std::string(path); } #elif defined(EMSCRIPTEN) std::string proc_self_dirname() -- cgit v1.2.3