Commit 31b38c31379ba9cbb2f4cece44b8cd2a37d0db95
2020-07-22T11:52:13
tools: don't mangle the path for tools, just exec directly Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/tools/tools-common.c b/tools/tools-common.c
index f7539fe..a78bc9a 100644
--- a/tools/tools-common.c
+++ b/tools/tools-common.c
@@ -206,27 +206,11 @@ tools_enable_stdin_echo(void)
#endif
-static inline bool
-tools_setup_path(void)
-{
- const char *path = getenv("PATH");
- const char *extra_path = LIBXKBCOMMON_TOOL_PATH;
- char new_path[PATH_MAX];
-
- if (snprintf_safe(new_path, sizeof(new_path), "%s:%s",
- extra_path, path ? path : "")) {
- setenv("PATH", new_path, 1);
- return true;
- } else {
- return false;
- }
-}
-
int
tools_exec_command(const char *prefix, int real_argc, char **real_argv)
{
char *argv[64] = {NULL};
- char executable[128];
+ char executable[PATH_MAX];
const char *command;
if (((size_t)real_argc >= ARRAY_SIZE(argv))) {
@@ -235,23 +219,24 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv)
}
command = real_argv[0];
+#ifdef _MSC_VER
+#define PATH_SEP '\\'
+#else
+#define PATH_SEP '/'
+#endif
if (!snprintf_safe(executable, sizeof(executable),
- "%s-%s", prefix, command)) {
+ "%s%c%s-%s", LIBXKBCOMMON_TOOL_PATH, PATH_SEP,
+ prefix, command)) {
fprintf(stderr, "Failed to assemble command\n");
return EXIT_FAILURE;
}
- if (!tools_setup_path()) {
- fprintf(stderr, "Failed to set PATH\n");
- return EXIT_FAILURE;
- }
-
argv[0] = executable;
for (int i = 1; i < real_argc; i++)
argv[i] = real_argv[i];
- execvp(executable, argv);
+ execv(executable, argv);
if (errno == ENOENT) {
fprintf(stderr, "Command '%s' is not available\n", command);
return EXIT_INVALID_USAGE;