#include "SDCCmacro.h"
#include "SDCCutil.h"
#include "newalloc.h"
+#ifndef _WIN32
+#include "findme.h"
+#endif
/** Given an array of name, value string pairs creates a new hash
containing all of the pairs.
char *
getBinPath(const char *prel)
{
- char *p;
- size_t len;
static char path[PATH_MAX];
-
- if ((p = strrchr(prel, DIR_SEPARATOR_CHAR)) == NULL)
- return NULL;
+ const char *ret_path;
+
+ if (NULL != (ret_path = findProgramPath(prel))) {
+ char *p;
+ size_t len;
- len = min((sizeof path) - 1, p - prel);
- strncpy(path, prel, len);
- path[len] = '\0';
+ if (NULL != (p = strrchr(ret_path, DIR_SEPARATOR_CHAR)) &&
+ PATH_MAX > (len = p - ret_path)) {
+ memcpy(path, ret_path, len);
+ path[len] = '\0';
+ free((void *)ret_path);
- return path;
+ return path;
+ }
+ else {
+ free((void *)ret_path);
+
+ return NULL;
+ }
+ }
+ else
+ return NULL;
}
#endif