luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio: add support for terminal with no option

Browse Source 
Introduce support for terminals executing commands without an option,
i.e., the command is passed directly as argument to the terminal emulator.
This is needed for xdg-terminal-exec.
This commit is contained in:
Max Gautier 2022-07-23 22:00:53 +02:00 committed by Marco Trevisan (Treviño)
parent eb2d1d8fc8
commit b64347d279
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/gdesktopappinfo.c
View File

@ -2629,7 +2629,7 @@ prepend_terminal_to_vector (int *argc,
char **real_argv;
size_t real_argc;
size_t i;
int term_argc = 2;
size_t term_argc;
char *found_terminal;
char **the_argv;
const char *term_arg;
@ -2681,14 +2681,21 @@ prepend_terminal_to_vector (int *argc,
return FALSE;
}
/* check if the terminal require an option */
term_argc = term_arg ? 2 : 1;
real_argc = term_argc + *argc;
real_argv = g_new (char *, real_argc + 1);
real_argv[0] = found_terminal;
real_argv[1] = g_strdup (term_arg);
i = 0;
real_argv[i++] = found_terminal;
for (i = term_argc; i < real_argc; i++)
real_argv[i] = the_argv[i - term_argc];
if (term_arg)
real_argv[i++] = g_strdup (term_arg);
g_assert (i == term_argc);
for (int j = 0; j < *argc; j++)
real_argv[i++] = the_argv[j];
real_argv[i] = NULL;