nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved MooCmd into moospawn.[ch]; made it private

Browse Source
This commit is contained in:
Yevgen Muntyan 2006-08-20 03:49:03 -05:00
parent 1f7b0d7f04
commit dd28bc478f
3 changed files with 55 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moo/mooutils/Makefile.am
View File

@ -28,7 +28,6 @@ mooutils_include_headers = \
mooactioncollection.h \
moobigpaned.h \
mooclosure.h \
moocmd.h \
moocombo.h \
mooconfig.h \
mooentry.h \
@ -78,7 +77,6 @@ mooutils_sources = \
mooactiongroup.c \
moobigpaned.c \
mooclosure.c \
moocmd.c \
moocombo.c \
moocompat.c \
moocompat.h \
@ -109,6 +107,8 @@ mooutils_sources = \
mooprefsdialog.c \
mooprefsdialogpage.c \
moopython.c \
moospawn.h \
moospawn.c \
moostock.c \
moouixml.c \
mooundo.c \

65
moo/mooutils/moocmd.c → moo/mooutils/moospawn.c
View File

@ -1,5 +1,5 @@
/*
* moocmd.c
* moospawn.c
*
* Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
*
@ -11,9 +11,10 @@
* See COPYING file that comes with this distribution.
*/
#include "mooutils/moocmd.h"
#include "mooutils/moospawn.h"
#include "mooutils/moomarshals.h"
#include "mooutils/mooutils-misc.h"
#include <string.h>
#ifndef __WIN32__
#include <sys/wait.h>
@ -38,6 +39,8 @@ struct _MooCmdPrivate {
guint child_watch;
guint stdout_watch;
guint stderr_watch;
GString *out_buffer;
GString *err_buffer;
};
static void moo_cmd_finalize (GObject *object);
@ -92,11 +95,11 @@ enum {
/* MOO_TYPE_CMD */
G_DEFINE_TYPE (MooCmd, moo_cmd, G_TYPE_OBJECT)
G_DEFINE_TYPE (MooCmd, _moo_cmd, G_TYPE_OBJECT)
static void
moo_cmd_class_init (MooCmdClass *klass)
_moo_cmd_class_init (MooCmdClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@ -108,6 +111,8 @@ moo_cmd_class_init (MooCmdClass *klass)
klass->stdout_text = moo_cmd_stdout_text;
klass->stderr_text = moo_cmd_stderr_text;
g_type_class_add_private (klass, sizeof (MooCmdPrivate));
signals[ABORT] =
g_signal_new ("abort",
G_OBJECT_CLASS_TYPE (klass),
@ -150,11 +155,11 @@ moo_cmd_class_init (MooCmdClass *klass)
static void
moo_cmd_init (MooCmd *cmd)
_moo_cmd_init (MooCmd *cmd)
{
cmd->priv = g_new0 (MooCmdPrivate, 1);
cmd->out_buffer = g_string_new (NULL);
cmd->err_buffer = g_string_new (NULL);
cmd->priv = G_TYPE_INSTANCE_GET_PRIVATE (cmd, MOO_TYPE_CMD, MooCmdPrivate);
cmd->priv->out_buffer = g_string_new (NULL);
cmd->priv->err_buffer = g_string_new (NULL);
}
@ -163,12 +168,10 @@ moo_cmd_finalize (GObject *object)
{
MooCmd *cmd = MOO_CMD (object);
g_string_free (cmd->out_buffer, TRUE);
g_string_free (cmd->err_buffer, TRUE);
g_string_free (cmd->priv->out_buffer, TRUE);
g_string_free (cmd->priv->err_buffer, TRUE);
g_free (cmd->priv);
G_OBJECT_CLASS (moo_cmd_parent_class)->finalize (object);
G_OBJECT_CLASS (_moo_cmd_parent_class)->finalize (object);
}
@ -178,22 +181,22 @@ moo_cmd_dispose (GObject *object)
MooCmd *cmd = MOO_CMD (object);
if (cmd->priv->pid)
moo_cmd_abort (cmd);
_moo_cmd_abort (cmd);
moo_cmd_cleanup (cmd);
G_OBJECT_CLASS (moo_cmd_parent_class)->dispose (object);
G_OBJECT_CLASS (_moo_cmd_parent_class)->dispose (object);
}
MooCmd*
moo_cmd_new_full (const char *working_dir,
char **argv,
char **envp,
GSpawnFlags flags,
MooCmdFlags cmd_flags,
GSpawnChildSetupFunc child_setup,
gpointer user_data,
GError **error)
_moo_cmd_new (const char *working_dir,
char **argv,
char **envp,
GSpawnFlags flags,
MooCmdFlags cmd_flags,
GSpawnChildSetupFunc child_setup,
gpointer user_data,
GError **error)
{
MooCmd *cmd;
gboolean result;
@ -631,7 +634,7 @@ moo_cmd_abort_real (MooCmd *cmd)
void
moo_cmd_abort (MooCmd *cmd)
_moo_cmd_abort (MooCmd *cmd)
{
gboolean handled;
g_return_if_fail (MOO_IS_CMD (cmd));
@ -644,7 +647,7 @@ moo_cmd_stdout_text (MooCmd *cmd,
const char *text)
{
if (cmd->priv->cmd_flags & MOO_CMD_COLLECT_STDOUT)
g_string_append (cmd->out_buffer, text);
g_string_append (cmd->priv->out_buffer, text);
return FALSE;
}
@ -654,6 +657,16 @@ moo_cmd_stderr_text (MooCmd *cmd,
const char *text)
{
if (cmd->priv->cmd_flags & MOO_CMD_COLLECT_STDERR)
g_string_append (cmd->err_buffer, text);
g_string_append (cmd->priv->err_buffer, text);
return FALSE;
}
gboolean
_moo_unix_spawn_async (char **argv,
GSpawnFlags g_flags,
GError **error)
{
return g_spawn_async (NULL, argv, NULL, g_flags,
NULL, NULL, NULL, error);
}

27
moo/mooutils/moocmd.h → moo/mooutils/moospawn.h
View File

@ -1,5 +1,5 @@
/*
* moocmd.h
* moospawn.h
*
* Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
*
@ -11,15 +11,15 @@
* See COPYING file that comes with this distribution.
*/
#ifndef __MOO_CMD_H__
#define __MOO_CMD_H__
#ifndef __MOO_SPAWN_H__
#define __MOO_SPAWN_H__
#include <glib-object.h>
G_BEGIN_DECLS
#define MOO_TYPE_CMD (moo_cmd_get_type ())
#define MOO_TYPE_CMD (_moo_cmd_get_type ())
#define MOO_CMD(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MOO_TYPE_CMD, MooCmd))
#define MOO_CMD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOO_TYPE_CMD, MooCmdClass))
#define MOO_IS_CMD(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MOO_TYPE_CMD))
@ -43,16 +43,13 @@ typedef enum {
struct _MooCmd
{
GObject object;
GString *out_buffer;
GString *err_buffer;
GObject base;
MooCmdPrivate *priv;
};
struct _MooCmdClass
{
GObjectClass object_class;
GObjectClass base_class;
/* action signal */
gboolean (*abort) (MooCmd *cmd);
@ -66,9 +63,13 @@ struct _MooCmdClass
};
GType moo_cmd_get_type (void) G_GNUC_CONST;
GType _moo_cmd_get_type (void) G_GNUC_CONST;
MooCmd *moo_cmd_new_full (const char *working_dir,
gboolean _moo_unix_spawn_async (char **argv,
GSpawnFlags g_flags,
GError **error);
MooCmd *_moo_cmd_new (const char *working_dir,
char **argv,
char **envp,
GSpawnFlags flags,
@ -77,9 +78,9 @@ MooCmd *moo_cmd_new_full (const char *working_dir,
gpointer user_data,
GError **error);
void moo_cmd_abort (MooCmd *cmd);
void _moo_cmd_abort (MooCmd *cmd);
G_END_DECLS
#endif /* __MOO_CMD_H__ */
#endif /* __MOO_SPAWN_H__ */