Add exec_program_on_host_daemonized

This commit is contained in:
dec05eba
2025-12-01 19:57:56 +01:00
parent 71d28f8ba3
commit 2c2633ec58
2 changed files with 29 additions and 5 deletions

View File

@@ -13,13 +13,17 @@ namespace gsr {
// Arguments ending with NULL
bool exec_program_daemonized(const char **args, bool debug = true);
// Arguments ending with NULL.
// This works the same as |exec_program_get_stdout|, except on flatpak where this runs the program on the
// host machine with flatpak-spawn --host.
bool exec_program_on_host_daemonized(const char **args, bool debug = true);
// Arguments ending with NULL. |read_fd| can be NULL
pid_t exec_program(const char **args, int *read_fd, bool debug = true);
// Arguments ending with NULL. Returns the exit status of the program or -1 on error
int exec_program_get_stdout(const char **args, std::string &result, bool debug = true);
// Arguments ending with NULL. Returns the exit status of the program or -1 on error.
// This works the same as |exec_program_get_stdout|, except on flatpak where this runs the program on the
// host machine with flatpak-spawn --host
// host machine with flatpak-spawn --host.
int exec_program_on_host_get_stdout(const char **args, std::string &result, bool debug = true);
pid_t pidof(const char *process_name, pid_t ignore_pid);
}

View File

@@ -73,6 +73,28 @@ namespace gsr {
return true;
}
bool exec_program_on_host_daemonized(const char **args, bool debug) {
if(count_num_args(args) > 64 - 3) {
fprintf(stderr, "Error: too many arguments when trying to launch \"%s\"\n", args[0]);
return -1;
}
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
if(inside_flatpak) {
// Assumes programs wont need more than 64 - 3 args
const char *modified_args[64] = { "flatpak-spawn", "--host", "--" };
for(int i = 3; i < 64; ++i) {
const char *arg = args[i - 3];
modified_args[i] = arg;
if(!arg)
break;
}
return exec_program_daemonized(modified_args, debug);
} else {
return exec_program_daemonized(args, debug);
}
}
pid_t exec_program(const char **args, int *read_fd, bool debug) {
if(read_fd)
*read_fd = -1;
@@ -164,11 +186,9 @@ namespace gsr {
const char *modified_args[64] = { "flatpak-spawn", "--host", "--" };
for(int i = 3; i < 64; ++i) {
const char *arg = args[i - 3];
if(!arg) {
modified_args[i] = nullptr;
break;
}
modified_args[i] = arg;
if(!arg)
break;
}
return exec_program_get_stdout(modified_args, result, debug);
} else {