From 6a5375ace4e34553f14b929a059d75c914ef291b Mon Sep 17 00:00:00 2001 From: rofl0r Date: Wed, 27 Apr 2022 17:33:41 +0000 Subject: [PATCH] implement AddSubSearchPathFromWinBin() counterpart for unix this looks up paths relative to the binary used to start the specific application. --- src/common/searchpath.c | 138 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 126 insertions(+), 12 deletions(-) diff --git a/src/common/searchpath.c b/src/common/searchpath.c index 70237a1c9..ac507d924 100644 --- a/src/common/searchpath.c +++ b/src/common/searchpath.c @@ -44,6 +44,12 @@ #else /* Anyone else */ # include +# include +# include +# ifndef PATH_MAX +# define PATH_MAX 4096 +# endif +# include "cmdline.h" #endif /* common */ @@ -157,18 +163,127 @@ void AddSubSearchPathFromEnv (SearchPaths* P, const char* EnvVar, const char* Su SB_Done (&Dir); } +#ifdef _WIN32 +#define PATHSEP "\\" +#undef PATH_MAX +#define PATH_MAX _MAX_PATH +#else +#define PATHSEP "/" + +/* + on POSIX-compatible operating system, a binary can be started in + 3 distinct ways: + + 1) using absolute path; in which case argv[0] starts with '/' + 2) using relative path; in which case argv[0] contains '/', but + does not start with it. e.g.: ./ca65 ; bin/cc65 + 3) using PATH environment variable, which is a colon-separated + list of directories which will be searched for a command + name used unprefixed. see execlp() and execvp() in man 3p exec: + +> The argument file is used to construct a pathname that identifies the new +> process image file. If the file argument contains a character, +> the file argument shall be used as the pathname for this file. +> Otherwise, the path prefix for this file is obtained by a search of the +> directories passed as the environment variable PATH (see the Base +> Definitions volume of POSIX.1*2008, Chapter 8, Environment Variables). +> If this environment variable is not present, the results of the search +> are implementation-defined. + +*/ + + + +static int SearchPathBin(const char* bin, char* buf, size_t buflen) +/* search colon-separated list of paths in PATH environment variable +** for the full path of argv[0]. +** returns 1 if successfull, in which case buf will contain the full path. +** bin = binary name (from argv[0]), buf = work buffer, buflen = sizeof buf +*/ +{ + char* p = getenv ("PATH"); + char* o; + size_t l; + + if (!p) { + return 0; + } + for (;;) { + o = buf; + l = buflen; + while (l && *p && *p != ':') { + *(o++) = *(p++); + l--; + } + snprintf (o, l, "/%s", bin); + if (access (buf, X_OK) == 0) { + return 1; + } + if (*p == ':') { + p++; + } else if (!p) { + break; + } + } + return 0; +} + + + +static char* MyDirname(char* in) +/* returns the dirname() part of a filename. +** the passed string is modified in place, then returned. +*/ +{ + char* p = strrchr (in, '/'); + + if (p) { + *p = 0; + } + return in; +} + + + +static char* GetProgPath(char* pathbuf, char* a0) +/* search for the full path of the binary using the argv[0] parameter +** passed to int main(), according to the description above. +** if the binary was started using a relative path, realpath(3p) will +** turn the relative path into an absolute path with pwd resolved, and +** gratuitous path components such as "./" or ".." removed. +** +** argument "pathbuf" is a work buffer of size PATH_MAX, +** "a0" the original argv[0]. +** returns pathbuf with the full path of the binary, minus the binary +** name itself. +*/ +{ + if (a0[0] == '/') { + strcpy (pathbuf, a0); + } else if (a0[0] == '.' || strrchr (a0, '/')) { + /* realpath returns the work buffer passed to it, so checking the + return value is superfluous. gcc11 warns anyway. */ + if (realpath (a0, pathbuf)) {} + } else { + SearchPathBin (a0, pathbuf, PATH_MAX); + } + return MyDirname(pathbuf); +} + +#endif + void AddSubSearchPathFromWinBin (SearchPaths* P, const char* SubDir) { /* Windows only: ** Add a search path from the running binary, adding a subdirectory to ** the parent directory of the directory containing the binary. */ -#if defined(_WIN32) - - char Dir[_MAX_PATH]; char* Ptr; + char Dir[PATH_MAX]; + +#if defined(_WIN32) if (GetModuleFileName (NULL, Dir, _MAX_PATH) == 0) { return; @@ -181,12 +296,18 @@ void AddSubSearchPathFromWinBin (SearchPaths* P, const char* SubDir) } *Ptr = '\0'; +#else + + GetProgPath(Dir, ArgVec[0]); + +#endif + /* Check for 'bin' directory */ - Ptr = strrchr (Dir, '\\'); + Ptr = strrchr (Dir, PATHSEP[0]); if (Ptr == 0) { return; } - if (strcmp (Ptr++, "\\bin") != 0) { + if (strcmp (Ptr++, PATHSEP "bin") != 0) { return; } @@ -195,13 +316,6 @@ void AddSubSearchPathFromWinBin (SearchPaths* P, const char* SubDir) /* Add the search path */ AddSearchPath (P, Dir); - -#else - - (void) P; - (void) SubDir; - -#endif }