mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-19 15:37:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

flatpak_quote_argv: Add len argument

Browse Source 
This way we can quote a partial array

Closes: #1676
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2018-05-15 14:46:35 +02:00
committed by Atomic Bot
parent 3902a3fd32
commit 2deb8f1e11
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/flatpak-run.c
View File

@@ -1853,7 +1853,7 @@ prepend_bwrap_argv_wrapper (GPtrArray *argv,
g_ptr_array_add (bwrap_args, NULL);
{
g_autofree char *commandline = flatpak_quote_argv ((const char **) bwrap_args->pdata);
g_autofree char *commandline = flatpak_quote_argv ((const char **) bwrap_args->pdata, -1);
flatpak_debug2 ("bwrap args '%s'", commandline);
}
@@ -1957,7 +1957,7 @@ add_dbus_proxy_args (GPtrArray *argv_array,
if (!prepend_bwrap_argv_wrapper (dbus_proxy_argv, app_info_fd, &bwrap_args_fd, error))
return FALSE;
commandline = flatpak_quote_argv ((const char **) dbus_proxy_argv->pdata);
commandline = flatpak_quote_argv ((const char **) dbus_proxy_argv->pdata, -1);
flatpak_debug2 ("Running '%s'", commandline);
spawn_data.sync_fd = sync_fds[1];
@@ -2720,7 +2720,7 @@ regenerate_ld_cache (GPtrArray *base_argv_array,
g_ptr_array_add (bwrap->argv, NULL);
commandline = flatpak_quote_argv ((const char **) bwrap->argv->pdata);
commandline = flatpak_quote_argv ((const char **) bwrap->argv->pdata, -1);
flatpak_debug2 ("Running: '%s'", commandline);
combined_fd_array = g_array_new (FALSE, TRUE, sizeof (int));
@@ -3083,8 +3083,8 @@ flatpak_run_app (const char *app_ref,
g_ptr_array_add (real_argv_array, NULL);
g_ptr_array_add (bwrap->argv, NULL);
commandline = flatpak_quote_argv ((const char **) bwrap->argv->pdata);
commandline2 = flatpak_quote_argv (((const char **) real_argv_array->pdata) + commandline_2_start);
commandline = flatpak_quote_argv ((const char **) bwrap->argv->pdata, -1);
commandline2 = flatpak_quote_argv (((const char **) real_argv_array->pdata) + commandline_2_start, -1);
flatpak_debug2 ("Running '%s %s'", commandline, commandline2);
if ((flags & FLATPAK_RUN_FLAG_BACKGROUND) != 0)

8
common/flatpak-utils.c
View File

@@ -1754,12 +1754,16 @@ needs_quoting (const char *arg)
}
char *
flatpak_quote_argv (const char *argv[])
flatpak_quote_argv (const char *argv[],
gssize len)
{
GString *res = g_string_new ("");
int i;
for (i = 0; argv[i] != NULL; i++)
if (len == -1)
len = g_strv_length ((char **)argv);
for (i = 0; i < len; i++)
{
if (i != 0)
g_string_append_c (res, ' ');

3
common/flatpak-utils.h
View File

@@ -414,7 +414,8 @@ GList *flatpak_list_extensions (GKeyFile *metakey,
const char *arch,
const char *branch);
char * flatpak_quote_argv (const char *argv[]);
char * flatpak_quote_argv (const char *argv[],
gssize len);
gboolean flatpak_file_arg_has_suffix (const char *arg, const char *suffix);
const char *flatpak_file_get_path_cached (GFile *file);