diff --git a/exec_cmd.c b/exec_cmd.c
index da04efe951e5b8dc4e7b72246212d8ebabc09ec6..45f92eb164f5680c224b2f96f146912224e7b03d 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
extern char **environ;
static const char *argv_exec_path;
+static const char *argv0_path;
static const char *builtin_exec_path(void)
{
#endif
}
+const char *system_path(const char *path)
+{
+ if (!is_absolute_path(path) && argv0_path) {
+ struct strbuf d = STRBUF_INIT;
+ strbuf_addf(&d, "%s/%s", argv0_path, path);
+ path = strbuf_detach(&d, NULL);
+ }
+ return path;
+}
+
+void git_set_argv0_path(const char *path)
+{
+ argv0_path = path;
+}
+
void git_set_argv_exec_path(const char *exec_path)
{
argv_exec_path = exec_path;
}
}
-void setup_path(const char *cmd_path)
+void setup_path(void)
{
const char *old_path = getenv("PATH");
struct strbuf new_path;
add_path(&new_path, argv_exec_path);
add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
add_path(&new_path, builtin_exec_path());
- add_path(&new_path, cmd_path);
+ add_path(&new_path, argv0_path);
if (old_path)
strbuf_addstr(&new_path, old_path);