From b8d53f77acf1ed08ba808014e534e07c9dd40daf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 28 Feb 2011 23:19:49 +0100 Subject: [PATCH] On Cygwin, use /proc file system instead of win32 API. * lib/relocatable.c: On Cygwin, use file names from /proc, rather than Win32 file names. (DllMain): Simplify by removing Cygwin specific code. (find_shared_library_fullname): Use Linux specific implementation also for Cygwin. (get_shared_library_fullname): Update accordingly. * lib/progreloc.c: On Cygwin, use file names from /proc, rather than Win32 file names. (find_executable): On Cygwin, use /proc, like on Linux. Remove previous Cygwin specific code. --- ChangeLog | 16 ++++++++++++++ lib/progreloc.c | 65 +++++++++++++++++++++++++------------------------------ lib/relocatable.c | 44 ++++++++++++++----------------------- 3 files changed, 62 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e10af68b..eaecb2e89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2011-02-28 Corinna Vinschen (tiny change) + Charles Wilson (tiny change) + Bruno Haible (tiny change) + + On Cygwin, use /proc file system instead of win32 API. + * lib/relocatable.c: On Cygwin, use file names from /proc, rather than + Win32 file names. + (DllMain): Simplify by removing Cygwin specific code. + (find_shared_library_fullname): Use Linux specific implementation also + for Cygwin. + (get_shared_library_fullname): Update accordingly. + * lib/progreloc.c: On Cygwin, use file names from /proc, rather than + Win32 file names. + (find_executable): On Cygwin, use /proc, like on Linux. Remove previous + Cygwin specific code. + 2011-02-28 Christian Rössel (tiny change) Markus Geimer (tiny change) diff --git a/lib/progreloc.c b/lib/progreloc.c index acfbcb3f7..0769c5e1c 100644 --- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -34,11 +34,11 @@ # include #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WIN32_NATIVE #endif -#if defined WIN32_NATIVE || defined __CYGWIN__ +#ifdef WIN32_NATIVE # define WIN32_LEAN_AND_MEAN # include #endif @@ -72,8 +72,8 @@ extern char * canonicalize_file_name (const char *name); ISSLASH(C) tests whether C is a directory separator character. IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS */ +#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ @@ -102,7 +102,7 @@ extern char * canonicalize_file_name (const char *name); #if ENABLE_RELOCATABLE -#ifdef __linux__ +#if defined __linux__ || defined __CYGWIN__ /* File descriptor of the executable. (Only used to verify that we find the correct executable.) */ static int executable_fd = -1; @@ -112,12 +112,13 @@ static int executable_fd = -1; static bool maybe_executable (const char *filename) { - /* Woe32 lacks the access() function, but Cygwin doesn't. */ -#if !(defined WIN32_NATIVE && !defined __CYGWIN__) + /* Woe32 lacks the access() function. */ +#if !defined WIN32_NATIVE if (access (filename, X_OK) < 0) return false; +#endif -# ifdef __linux__ +#if defined __linux__ || defined __CYGWIN__ if (executable_fd >= 0) { /* If we already have an executable_fd, check that filename points to @@ -135,7 +136,6 @@ maybe_executable (const char *filename) return false; } } -# endif #endif return true; @@ -148,7 +148,12 @@ maybe_executable (const char *filename) static char * find_executable (const char *argv0) { -#if defined WIN32_NATIVE || defined __CYGWIN__ +#if defined WIN32_NATIVE + /* Native Win32 only. + On Cygwin, it is better to use the Cygwin provided /proc interface, than + to use native Win32 API and cygwin_conv_to_posix_path, because it supports + longer file names + (see ). */ char location[MAX_PATH]; int length = GetModuleFileName (NULL, location, sizeof (location)); if (length < 0) @@ -156,31 +161,8 @@ find_executable (const char *argv0) if (!IS_PATH_WITH_DIR (location)) /* Shouldn't happen. */ return NULL; - { -# if defined __CYGWIN__ - /* cygwin-1.5.13 (2005-03-01) or newer would also allow a Linux-like - implementation: readlink of "/proc/self/exe". But using the - result of the Win32 system call is simpler and is consistent with the - code in relocatable.c. */ - /* On Cygwin, we need to convert paths coming from Win32 system calls - to the Unix-like slashified notation. */ - static char location_as_posix_path[2 * MAX_PATH]; - /* There's no error return defined for cygwin_conv_to_posix_path. - See cygwin-api/func-cygwin-conv-to-posix-path.html. - Does it overflow the buffer of expected size MAX_PATH or does it - truncate the path? I don't know. Let's catch both. */ - cygwin_conv_to_posix_path (location, location_as_posix_path); - location_as_posix_path[MAX_PATH - 1] = '\0'; - if (strlen (location_as_posix_path) >= MAX_PATH - 1) - /* A sign of buffer overflow or path truncation. */ - return NULL; - /* Call canonicalize_file_name, because Cygwin supports symbolic links. */ - return canonicalize_file_name (location_as_posix_path); -# else - return xstrdup (location); -# endif - } -#else /* Unix && !Cygwin */ + return xstrdup (location); +#else /* Unix */ # ifdef __linux__ /* The executable is accessible as /proc//exe. In newer Linux versions, also as /proc/self/exe. Linux >= 2.1 provides a symlink @@ -206,6 +188,19 @@ find_executable (const char *argv0) } } # endif +# ifdef __CYGWIN__ + /* The executable is accessible as /proc//exe, at least in + Cygwin >= 1.5. */ + { + char *link; + + link = xreadlink ("/proc/self/exe"); + if (link != NULL) + return link; + if (executable_fd < 0) + executable_fd = open ("/proc/self/exe", O_EXEC, 0); + } +# endif # if HAVE_MACH_O_DYLD_H && HAVE__NSGETEXECUTABLEPATH /* On MacOS X 10.2 or newer, the function int _NSGetExecutablePath (char *buf, uint32_t *bufsize); diff --git a/lib/relocatable.c b/lib/relocatable.c index 3fc666bd0..cbff85fa6 100644 --- a/lib/relocatable.c +++ b/lib/relocatable.c @@ -43,7 +43,7 @@ # include "xalloc.h" #endif -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN # include #endif @@ -70,8 +70,8 @@ ISSLASH(C) tests whether C is a directory separator character. IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS */ +#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ @@ -293,7 +293,12 @@ compute_curr_prefix (const char *orig_installprefix, /* Full pathname of shared library, or NULL. */ static char *shared_library_fullname; -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +/* Native Win32 only. + On Cygwin, it is better to use the Cygwin provided /proc interface, than + to use native Win32 API and cygwin_conv_to_posix_path, because it supports + longer file names + (see ). */ /* Determine the full pathname of the shared library when it is loaded. */ @@ -315,38 +320,21 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) /* Shouldn't happen. */ return FALSE; - { -#if defined __CYGWIN__ - /* On Cygwin, we need to convert paths coming from Win32 system calls - to the Unix-like slashified notation. */ - static char location_as_posix_path[2 * MAX_PATH]; - /* There's no error return defined for cygwin_conv_to_posix_path. - See cygwin-api/func-cygwin-conv-to-posix-path.html. - Does it overflow the buffer of expected size MAX_PATH or does it - truncate the path? I don't know. Let's catch both. */ - cygwin_conv_to_posix_path (location, location_as_posix_path); - location_as_posix_path[MAX_PATH - 1] = '\0'; - if (strlen (location_as_posix_path) >= MAX_PATH - 1) - /* A sign of buffer overflow or path truncation. */ - return FALSE; - shared_library_fullname = strdup (location_as_posix_path); -#else - shared_library_fullname = strdup (location); -#endif - } + shared_library_fullname = strdup (location); } return TRUE; } -#else /* Unix except Cygwin */ +#else /* Unix */ static void find_shared_library_fullname () { -#if defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__) +#if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. */ + function. + Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ FILE *fp; /* Open the current process' maps file. It describes one VMA per line. */ @@ -391,7 +379,7 @@ find_shared_library_fullname () #endif } -#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */ +#endif /* WIN32 / Unix */ /* Return the full pathname of the current shared library. Return NULL if unknown. @@ -399,7 +387,7 @@ find_shared_library_fullname () static char * get_shared_library_fullname () { -#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__) +#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) static bool tried_find_shared_library_fullname; if (!tried_find_shared_library_fullname) { -- 2.11.0