flatpak-bwrap.c (flatpak-1.15.1.tar.xz) | : | flatpak-bwrap.c (flatpak-1.15.2.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 374 | skipping to change at line 374 | |||
data = g_new (gchar, data_len); | data = g_new (gchar, data_len); | |||
ptr = data; | ptr = data; | |||
for (i = start; i < end; i++) | for (i = start; i < end; i++) | |||
ptr = g_stpcpy (ptr, bwrap->argv->pdata[i]) + 1; | ptr = g_stpcpy (ptr, bwrap->argv->pdata[i]) + 1; | |||
if (!flatpak_buffer_to_sealed_memfd_or_tmpfile (&args_tmpf, "bwrap-args", data , data_len, error)) | if (!flatpak_buffer_to_sealed_memfd_or_tmpfile (&args_tmpf, "bwrap-args", data , data_len, error)) | |||
return FALSE; | return FALSE; | |||
fd = glnx_steal_fd (&args_tmpf.fd); | fd = glnx_steal_fd (&args_tmpf.fd); | |||
flatpak_debug2 ("bwrap --args %d = ...", fd); | g_debug ("bwrap --args %d = ...", fd); | |||
for (i = start; i < end; i++) | for (i = start; i < end; i++) | |||
{ | { | |||
if (flatpak_argument_needs_quoting (bwrap->argv->pdata[i])) | if (flatpak_argument_needs_quoting (bwrap->argv->pdata[i])) | |||
{ | { | |||
g_autofree char *quoted = g_shell_quote (bwrap->argv->pdata[i]); | g_autofree char *quoted = g_shell_quote (bwrap->argv->pdata[i]); | |||
flatpak_debug2 (" %s", quoted); | g_debug (" %s", quoted); | |||
} | } | |||
else | else | |||
{ | { | |||
flatpak_debug2 (" %s", (const char *) bwrap->argv->pdata[i]); | g_debug (" %s", (const char *) bwrap->argv->pdata[i]); | |||
} | } | |||
} | } | |||
flatpak_bwrap_add_fd (bwrap, fd); | flatpak_bwrap_add_fd (bwrap, fd); | |||
g_ptr_array_remove_range (bwrap->argv, start, end - start); | g_ptr_array_remove_range (bwrap->argv, start, end - start); | |||
if (one_arg) | if (one_arg) | |||
{ | { | |||
g_ptr_array_insert (bwrap->argv, start, g_strdup_printf ("--args=%d", fd)) ; | g_ptr_array_insert (bwrap->argv, start, g_strdup_printf ("--args=%d", fd)) ; | |||
} | } | |||
else | else | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |