Skip to content

Fixed Darwin-specific undefined behavior in get_executable_directory() #3

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed Darwin-specific undefined behavior in get_executable_directory() #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648d766
Fixed Darwin-specific undefined behavior in get_executable_directory(),
ink-splatters Mar 2, 2024
029e088
improved the fix to make it potentially work on other BSD systems
ink-splatters Mar 2, 2024
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
24 changes: 22 additions & 2 deletions src/filesystem_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,27 @@ static path_t get_executable_directory()

return path_t(filepath);
}
#else // _WIN32
#elif ! __linux__ // _WIN32
#include <libproc.h>
static path_t get_executable_directory()
{
char filepath[256];
filepath[0]='\0';

int pid = getpid();
int ret = proc_pidpath(pid, filepath, sizeof(filepath));

if ( ret <= 0 ) {
fprintf(stderr, "PID %d: proc_pidpath ();\n", pid);
fprintf(stderr, " %s\n", strerror(errno));
} else {
char* slash = strrchr(filepath, '/');
slash[1] = '\0';
}

return path_t(filepath);
}
#else // ! __linux__
static path_t get_executable_directory()
{
char filepath[256];
Expand All @@ -165,7 +185,7 @@ static path_t get_executable_directory()

return path_t(filepath);
}
#endif // _WIN32
#endif // ! __linux__

static bool filepath_is_readable(const path_t& path)
{
Expand Down