marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

builder: Merge spawn helpers to single base helper

tingping/wmclass
Alexander Larsson 2015-12-03 13:29:08 +01:00
parent 9396419b66
commit e76da99cdc
7 changed files with 158 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builder/builder-manifest.c
View File

@ -29,6 +29,7 @@
#include "builder-manifest.h"
#include "builder-utils.h"
#include "xdg-app-utils.h"
#include "libgsystem.h"
#include "libglnx/libglnx.h"
@ -658,34 +659,16 @@ builder_manifest_build (BuilderManifest *self,
static gboolean
strip (GError **error,
const gchar *argv1,
...)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
gboolean res;
va_list ap;
args = g_ptr_array_new ();
g_ptr_array_add (args, "strip");
va_start (ap, argv1);
g_ptr_array_add (args, (gchar *) argv1);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
va_start (ap, error);
res = xdg_app_spawn (NULL, NULL, error, "strip", ap);
va_end (ap);
launcher = g_subprocess_launcher_new (0);
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL ||
!g_subprocess_wait_check (subp, NULL, error))
return FALSE;
return TRUE;
return res;
}
guint16

67
builder/builder-source-archive.c
View File

@ -313,82 +313,33 @@ builder_source_archive_download (BuilderSource *source,
static gboolean
tar (GFile *dir,
GError **error,
const gchar *argv1,
...)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
gboolean res;
va_list ap;
args = g_ptr_array_new ();
g_ptr_array_add (args, "tar");
va_start (ap, argv1);
g_ptr_array_add (args, (gchar *) argv1);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
va_start (ap, error);
res = xdg_app_spawn (dir, NULL, error, "tar", ap);
va_end (ap);
launcher = g_subprocess_launcher_new (0);
if (dir)
{
g_autofree char *path = g_file_get_path (dir);
g_subprocess_launcher_set_cwd (launcher, path);
}
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL ||
!g_subprocess_wait_check (subp, NULL, error))
return FALSE;
return TRUE;
return res;
}
static gboolean
unzip (GFile *dir,
GError **error,
const gchar *argv1,
...)
...)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
gboolean res;
va_list ap;
args = g_ptr_array_new ();
g_ptr_array_add (args, "unzip");
va_start (ap, argv1);
g_ptr_array_add (args, (gchar *) argv1);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
va_start (ap, error);
res = xdg_app_spawn (dir, NULL, error, "unzip", ap);
va_end (ap);
launcher = g_subprocess_launcher_new (0);
if (dir)
{
g_autofree char *path = g_file_get_path (dir);
g_subprocess_launcher_set_cwd (launcher, path);
}
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL ||
!g_subprocess_wait_check (subp, NULL, error))
return FALSE;
return TRUE;
return res;
}
BuilderArchiveType
get_type (GFile *archivefile)
{

127
builder/builder-source-bzr.c
View File

@ -31,6 +31,7 @@
#include "builder-source-bzr.h"
#include "builder-utils.h"
#include "xdg-app-utils.h"
struct BuilderSourceBzr {
BuilderSource parent;
@ -99,138 +100,20 @@ builder_source_bzr_set_property (GObject *object,
}
}
typedef struct
{
GError *error;
GError *splice_error;
GMainLoop *loop;
int refs;
} BzrData;
static gboolean bzr (GFile *dir,
char **output,
GError **error,
const gchar *argv1,
...) G_GNUC_NULL_TERMINATED;
static void
bzr_data_exit (BzrData *data)
{
data->refs--;
if (data->refs == 0)
g_main_loop_quit (data->loop);
}
static void
bzr_output_spliced_cb (GObject *obj,
GAsyncResult *result,
gpointer user_data)
{
BzrData *data = user_data;
g_output_stream_splice_finish (G_OUTPUT_STREAM (obj), result, &data->splice_error);
bzr_data_exit (data);
}
static void
bzr_exit_cb (GObject *obj,
GAsyncResult *result,
gpointer user_data)
{
BzrData *data = user_data;
g_subprocess_wait_check_finish (G_SUBPROCESS (obj), result, &data->error);
bzr_data_exit (data);
}
static gboolean
bzr (GFile *dir,
char **output,
GError **error,
const gchar *argv1,
...)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
GInputStream *in;
g_autoptr(GOutputStream) out = NULL;
g_autoptr(GMainLoop) loop = NULL;
gboolean res;
va_list ap;
BzrData data = {0};
args = g_ptr_array_new ();
g_ptr_array_add (args, "bzr");
va_start (ap, argv1);
g_ptr_array_add (args, (gchar *) argv1);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
va_start (ap, error);
res = xdg_app_spawn (dir, output, error, "bzr", ap);
va_end (ap);
launcher = g_subprocess_launcher_new (0);
if (output)
g_subprocess_launcher_set_flags (launcher, G_SUBPROCESS_FLAGS_STDOUT_PIPE);
if (dir)
{
g_autofree char *path = g_file_get_path (dir);
g_subprocess_launcher_set_cwd (launcher, path);
}
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL)
return FALSE;
loop = g_main_loop_new (NULL, FALSE);
data.loop = loop;
data.refs = 1;
if (output)
{
data.refs++;
in = g_subprocess_get_stdout_pipe (subp);
out = g_memory_output_stream_new_resizable ();
g_output_stream_splice_async (out,
in,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
0,
NULL,
bzr_output_spliced_cb,
&data);
}
g_subprocess_wait_async (subp, NULL, bzr_exit_cb, &data);
g_main_loop_run (loop);
if (data.error)
{
g_propagate_error (error, data.error);
g_clear_error (&data.splice_error);
return FALSE;
}
if (out)
{
if (data.splice_error)
{
g_propagate_error (error, data.splice_error);
return FALSE;
}
/* Null terminate */
g_output_stream_write (out, "\0", 1, NULL, NULL);
*output = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (out));
}
return TRUE;
return res;
}
static GFile *

127
builder/builder-source-git.c
View File

@ -32,6 +32,7 @@
#include "builder-source-git.h"
#include "builder-utils.h"
#include "xdg-app-utils.h"
struct BuilderSourceGit {
BuilderSource parent;
@ -118,138 +119,20 @@ builder_source_git_set_property (GObject *object,
}
}
typedef struct
{
GError *error;
GError *splice_error;
GMainLoop *loop;
int refs;
} GitData;
static gboolean git (GFile *dir,
char **output,
GError **error,
const gchar *argv1,
...) G_GNUC_NULL_TERMINATED;
static void
git_data_exit (GitData *data)
{
data->refs--;
if (data->refs == 0)
g_main_loop_quit (data->loop);
}
static void
git_output_spliced_cb (GObject *obj,
GAsyncResult *result,
gpointer user_data)
{
GitData *data = user_data;
g_output_stream_splice_finish (G_OUTPUT_STREAM (obj), result, &data->splice_error);
git_data_exit (data);
}
static void
git_exit_cb (GObject *obj,
GAsyncResult *result,
gpointer user_data)
{
GitData *data = user_data;
g_subprocess_wait_check_finish (G_SUBPROCESS (obj), result, &data->error);
git_data_exit (data);
}
static gboolean
git (GFile *dir,
char **output,
GError **error,
const gchar *argv1,
...)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
GInputStream *in;
g_autoptr(GOutputStream) out = NULL;
g_autoptr(GMainLoop) loop = NULL;
gboolean res;
va_list ap;
GitData data = {0};
args = g_ptr_array_new ();
g_ptr_array_add (args, "git");
va_start (ap, argv1);
g_ptr_array_add (args, (gchar *) argv1);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
va_start (ap, error);
res = xdg_app_spawn (dir, output, error, "git", ap);
va_end (ap);
launcher = g_subprocess_launcher_new (0);
if (output)
g_subprocess_launcher_set_flags (launcher, G_SUBPROCESS_FLAGS_STDOUT_PIPE);
if (dir)
{
g_autofree char *path = g_file_get_path (dir);
g_subprocess_launcher_set_cwd (launcher, path);
}
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL)
return FALSE;
loop = g_main_loop_new (NULL, FALSE);
data.loop = loop;
data.refs = 1;
if (output)
{
data.refs++;
in = g_subprocess_get_stdout_pipe (subp);
out = g_memory_output_stream_new_resizable ();
g_output_stream_splice_async (out,
in,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
0,
NULL,
git_output_spliced_cb,
&data);
}
g_subprocess_wait_async (subp, NULL, git_exit_cb, &data);
g_main_loop_run (loop);
if (data.error)
{
g_propagate_error (error, data.error);
g_clear_error (&data.splice_error);
return FALSE;
}
if (out)
{
if (data.splice_error)
{
g_propagate_error (error, data.splice_error);
return FALSE;
}
/* Null terminate */
g_output_stream_write (out, "\0", 1, NULL, NULL);
*output = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (out));
}
return TRUE;
return res;
}
static GFile *

32
builder/builder-source-patch.c
View File

@ -147,40 +147,16 @@ builder_source_patch_download (BuilderSource *source,
static gboolean
patch (GFile *dir,
GError **error,
const gchar *argv1,
...)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
gboolean res;
va_list ap;
args = g_ptr_array_new ();
g_ptr_array_add (args, "patch");
va_start (ap, argv1);
g_ptr_array_add (args, (gchar *) argv1);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
va_start (ap, error);
res = xdg_app_spawn (dir, NULL, error, "git", ap);
va_end (ap);
launcher = g_subprocess_launcher_new (0);
if (dir)
{
g_autofree char *path = g_file_get_path (dir);
g_subprocess_launcher_set_cwd (launcher, path);
}
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL ||
!g_subprocess_wait_check (subp, NULL, error))
return FALSE;
return TRUE;
return res;
}
static gboolean

123
common/xdg-app-utils.c
View File

@ -1120,3 +1120,126 @@ xdg_app_supports_bundles (OstreeRepo *repo)
unlink (tmpfile);
return res;
}
typedef struct
{
GError *error;
GError *splice_error;
GMainLoop *loop;
int refs;
} SpawnData;
static void
spawn_data_exit (SpawnData *data)
{
data->refs--;
if (data->refs == 0)
g_main_loop_quit (data->loop);
}
static void
spawn_output_spliced_cb (GObject *obj,
GAsyncResult *result,
gpointer user_data)
{
SpawnData *data = user_data;
g_output_stream_splice_finish (G_OUTPUT_STREAM (obj), result, &data->splice_error);
spawn_data_exit (data);
}
static void
spawn_exit_cb (GObject *obj,
GAsyncResult *result,
gpointer user_data)
{
SpawnData *data = user_data;
g_subprocess_wait_check_finish (G_SUBPROCESS (obj), result, &data->error);
spawn_data_exit (data);
}
gboolean
xdg_app_spawn (GFile *dir,
char **output,
GError **error,
const gchar *argv0,
va_list ap)
{
g_autoptr(GSubprocessLauncher) launcher = NULL;
g_autoptr(GSubprocess) subp = NULL;
GPtrArray *args;
const gchar *arg;
GInputStream *in;
g_autoptr(GOutputStream) out = NULL;
g_autoptr(GMainLoop) loop = NULL;
SpawnData data = {0};
args = g_ptr_array_new ();
g_ptr_array_add (args, (gchar *) argv0);
while ((arg = va_arg (ap, const gchar *)))
g_ptr_array_add (args, (gchar *) arg);
g_ptr_array_add (args, NULL);
launcher = g_subprocess_launcher_new (0);
if (output)
g_subprocess_launcher_set_flags (launcher, G_SUBPROCESS_FLAGS_STDOUT_PIPE);
if (dir)
{
g_autofree char *path = g_file_get_path (dir);
g_subprocess_launcher_set_cwd (launcher, path);
}
subp = g_subprocess_launcher_spawnv (launcher, (const gchar * const *) args->pdata, error);
g_ptr_array_free (args, TRUE);
if (subp == NULL)
return FALSE;
loop = g_main_loop_new (NULL, FALSE);
data.loop = loop;
data.refs = 1;
if (output)
{
data.refs++;
in = g_subprocess_get_stdout_pipe (subp);
out = g_memory_output_stream_new_resizable ();
g_output_stream_splice_async (out,
in,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
0,
NULL,
spawn_output_spliced_cb,
&data);
}
g_subprocess_wait_async (subp, NULL, spawn_exit_cb, &data);
g_main_loop_run (loop);
if (data.error)
{
g_propagate_error (error, data.error);
g_clear_error (&data.splice_error);
return FALSE;
}
if (out)
{
if (data.splice_error)
{
g_propagate_error (error, data.splice_error);
return FALSE;
}
/* Null terminate */
g_output_stream_write (out, "\0", 1, NULL, NULL);
*output = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (out));
}
return TRUE;
}

7
common/xdg-app-utils.h
View File

@ -159,6 +159,13 @@ void xdg_app_table_printer_append_with_comma (XdgAppTablePrinter
void xdg_app_table_printer_finish_row (XdgAppTablePrinter *printer);
void xdg_app_table_printer_print (XdgAppTablePrinter *printer);
gboolean xdg_app_spawn (GFile *dir,
char **output,
GError **error,
const gchar *argv0,
va_list args);
#define AUTOLOCK(name) G_GNUC_UNUSED __attribute__((cleanup(xdg_app_auto_unlock_helper))) GMutex * G_PASTE(auto_unlock, __LINE__) = xdg_app_auto_lock_helper (&G_LOCK_NAME (name))
G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeRepo, g_object_unref)