From 4dec0a42c32ae918ed6c727e6c9ea4399676e7aa Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 11 Jan 2012 15:39:28 +0100 Subject: [PATCH] main.c (store_exe_path): Fix absolute path detection for Windows. 2012-01-11 Tobias Burnus * runtime/main.c (store_exe_path): Fix absolute path detection for Windows. From-SVN: r183094 --- libgfortran/ChangeLog | 7 ++++++- libgfortran/runtime/main.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 3e27ed952c0..b1e2b049b4f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,10 @@ +2012-01-11 Tobias Burnus + + * runtime/main.c (store_exe_path): Fix absolute path + detection for Windows. + 2012-01-11 Janne Blomqvist - Mike Stump + Mike Stump PR libfortran/51803 * runtime/main.c (store_exe_path): Handle getcwd failure and lack of the function better. diff --git a/libgfortran/runtime/main.c b/libgfortran/runtime/main.c index 1cad5eff725..9ee47022cc9 100644 --- a/libgfortran/runtime/main.c +++ b/libgfortran/runtime/main.c @@ -86,7 +86,8 @@ store_exe_path (const char * argv0) #define DIR_SEPARATOR '/' #endif - char buf[PATH_MAX], *cwd, *path; + char buf[PATH_MAX], *path; + const char *cwd; /* This can only happen if store_exe_path is called multiple times. */ if (please_free_exe_path_when_done) @@ -105,15 +106,22 @@ store_exe_path (const char * argv0) } #endif - /* On the simulator argv is not set. */ - if (argv0 == NULL || argv0[0] == '/') + /* If the path is absolute or on a simulator where argv is not set. */ +#ifdef __MINGW32__ + if (argv0 == NULL + || ('A' <= argv0[0] && argv0[0] <= 'Z' && argv0[1] == ':') + || ('a' <= argv0[0] && argv0[0] <= 'z' && argv0[1] == ':') + || (argv0[0] == '/' && argv0[1] == '/') + || (argv0[0] == '\\' && argv0[1] == '\\')) +#else + if (argv0 == NULL || argv0[0] == DIR_SEPARATOR) +#endif { exe_path = argv0; please_free_exe_path_when_done = 0; return; } - memset (buf, 0, sizeof (buf)); #ifdef HAVE_GETCWD cwd = getcwd (buf, sizeof (buf)); if (!cwd) -- 2.30.2