Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solaris fix #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

solaris fix #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 51 additions & 4 deletions src/whereami.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,62 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
return ok ? length : -1;
}

#ifdef __sun
#include <dlfcn.h>

WAI_NOINLINE WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
{
char buffer[PATH_MAX];
char* resolved = NULL;
int length = -1;

for(;;)
{
Dl_info info;

if (dladdr(WAI_RETURN_ADDRESS(), &info))
{
resolved = realpath(info.dli_fname, buffer);
if (!resolved)
break;

length = (int)strlen(resolved);
if (length <= capacity)
{
memcpy(out, resolved, length);

if (dirname_length)
{
int i;

for (i = length - 1; i >= 0; --i)
{
if (out[i] == '/')
{
*dirname_length = i;
break;
}
}
}
}
}

break;
}

return length;
}

#else

#if !defined(WAI_PROC_SELF_MAPS_RETRY)
#define WAI_PROC_SELF_MAPS_RETRY 5
#endif

#if !defined(WAI_PROC_SELF_MAPS)
#if defined(__sun)
#define WAI_PROC_SELF_MAPS "/proc/self/map"
#else
#define WAI_PROC_SELF_MAPS "/proc/self/maps"
#endif
#endif

#if defined(__ANDROID__) || defined(ANDROID)
#include <fcntl.h>
Expand Down Expand Up @@ -358,6 +403,8 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
return length;
}

#endif

#elif defined(__APPLE__)

#define _DARWIN_BETTER_REALPATH
Expand Down