mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-02 15:46:17 +01:00
0e1a3ee345
We weren't closing the streams after we were done reading or writing, which is kind of essential. The easy way to fix this is to just use g_output_stream_splice() to a GMemoryOutputStream rather than hand-rolling it. This results in a substantial reduction of code complexity. A second serious issue is that we were marking the task as complete when the process exits, but that's racy - there could still be data to read from stdout. Fix this by just refcounting outstanding operations. This code, not surprisingly, looks a lot like the "multi" test. Next, because processes output binary data, I'd be forced to annotate the char*/length pairs as (array) (element-type uint8). But rather than doing that, it's *far* simpler to just use GBytes. We need a version of this that actually validates as UTF-8, that will be in the next patch.
119 lines
6.3 KiB
C
119 lines
6.3 KiB
C
/* GIO - GLib Input, Output and Streaming Library
|
|
*
|
|
* Copyright © 2012,2013 Colin Walters <walters@verbum.org>
|
|
* Copyright © 2012,2013 Canonical Limited
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General
|
|
* Public License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*
|
|
* Author: Ryan Lortie <desrt@desrt.ca>
|
|
* Author: Colin Walters <walters@verbum.org>
|
|
*/
|
|
|
|
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
|
|
#error "Only <gio/gio.h> can be included directly."
|
|
#endif
|
|
|
|
#ifndef __G_SUBPROCESS_LAUNCHER_H__
|
|
#define __G_SUBPROCESS_LAUNCHER_H__
|
|
|
|
#include <gio/giotypes.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define G_TYPE_SUBPROCESS_LAUNCHER (g_subprocess_launcher_get_type ())
|
|
#define G_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS_LAUNCHER, GSubprocessLauncher))
|
|
#define G_IS_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS_LAUNCHER))
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
GType g_subprocess_launcher_get_type (void) G_GNUC_CONST;
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
GSubprocessLauncher * g_subprocess_launcher_new (GSubprocessFlags flags);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
GSubprocess * g_subprocess_launcher_spawn (GSubprocessLauncher *self,
|
|
GError **error,
|
|
const gchar *argv0,
|
|
...);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
GSubprocess * g_subprocess_launcher_spawnv (GSubprocessLauncher *self,
|
|
const gchar * const *argv,
|
|
GError **error);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
|
|
gchar **environ);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_setenv (GSubprocessLauncher *self,
|
|
const gchar *variable,
|
|
const gchar *value,
|
|
gboolean overwrite);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_unsetenv (GSubprocessLauncher *self,
|
|
const gchar *variable);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
const gchar * g_subprocess_launcher_getenv (GSubprocessLauncher *self,
|
|
const gchar *variable);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_cwd (GSubprocessLauncher *self,
|
|
const gchar *cwd);
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_flags (GSubprocessLauncher *self,
|
|
GSubprocessFlags flags);
|
|
|
|
/* Extended I/O control, only available on UNIX */
|
|
#ifdef G_OS_UNIX
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_stdin_file_path (GSubprocessLauncher *self,
|
|
const gchar *path);
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_take_stdin_fd (GSubprocessLauncher *self,
|
|
gint fd);
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_stdout_file_path (GSubprocessLauncher *self,
|
|
const gchar *path);
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_take_stdout_fd (GSubprocessLauncher *self,
|
|
gint fd);
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_stderr_file_path (GSubprocessLauncher *self,
|
|
const gchar *path);
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_take_stderr_fd (GSubprocessLauncher *self,
|
|
gint fd);
|
|
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_take_fd (GSubprocessLauncher *self,
|
|
gint source_fd,
|
|
gint target_fd);
|
|
|
|
/* Child setup, only available on UNIX */
|
|
GLIB_AVAILABLE_IN_2_40
|
|
void g_subprocess_launcher_set_child_setup (GSubprocessLauncher *self,
|
|
GSpawnChildSetupFunc child_setup,
|
|
gpointer user_data,
|
|
GDestroyNotify destroy_notify);
|
|
#endif
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __G_SUBPROCESS_H__ */
|