ostadmin: Initial code
This commit is contained in:
Colin Walters committed
1 parent
1de0cc238b
commit
18b6f5fd0c
17 files changed
+892
-94
No files matched your search
@@ -77,6 +77,34 @@ ot_gfile_ensure_directory (GFile *dir,
|
||||
return ret;
|
||||
}
|
||||
|
||||
GFile *
|
||||
ot_gfile_from_build_path (const char *first, ...)
|
||||
{
|
||||
va_list args;
|
||||
const char *arg;
|
||||
ot_lfree char *path = NULL;
|
||||
ot_lptrarray GPtrArray *components = NULL;
|
||||
|
||||
va_start (args, first);
|
||||
|
||||
components = g_ptr_array_new ();
|
||||
|
||||
arg = first;
|
||||
while (arg != NULL)
|
||||
{
|
||||
g_ptr_array_add (components, (char*)arg);
|
||||
arg = va_arg (args, const char *);
|
||||
}
|
||||
|
||||
va_end (args);
|
||||
|
||||
g_ptr_array_add (components, NULL);
|
||||
|
||||
path = g_build_filenamev ((char**)components->pdata);
|
||||
|
||||
return g_file_new_for_path (path);
|
||||
}
|
||||
|
||||
GFile *
|
||||
ot_gfile_get_child_strconcat (GFile *parent,
|
||||
const char *first,
|
||||
|
||||
@@ -36,6 +36,8 @@ G_BEGIN_DECLS
|
||||
|
||||
GFileType ot_gfile_type_for_mode (guint32 mode);
|
||||
|
||||
GFile *ot_gfile_from_build_path (const char *first, ...) G_GNUC_NULL_TERMINATED;
|
||||
|
||||
GFile *ot_gfile_get_child_strconcat (GFile *parent, const char *first, ...) G_GNUC_NULL_TERMINATED;
|
||||
|
||||
GFile *ot_gfile_new_for_path (const char *path);
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
||||
*
|
||||
* Copyright (C) 2011 Colin Walters <walters@verbum.org>
|
||||
*
|
||||
* 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: Colin Walters <walters@verbum.org>
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "otutil.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
gboolean
|
||||
ot_spawn_sync_checked (const char *cwd,
|
||||
char **argv,
|
||||
char **envp,
|
||||
GSpawnFlags flags,
|
||||
GSpawnChildSetupFunc child_setup,
|
||||
gpointer user_data,
|
||||
char **stdout_data,
|
||||
char **stderr_data,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
gint exit_status;
|
||||
char *ret_stdout_data = NULL;
|
||||
char *ret_stderr_data = NULL;
|
||||
|
||||
if (!g_spawn_sync (cwd, argv, envp, flags, child_setup, user_data,
|
||||
stdout_data ? &ret_stdout_data : NULL,
|
||||
stderr_data ? &ret_stderr_data : NULL,
|
||||
&exit_status,
|
||||
error))
|
||||
goto out;
|
||||
|
||||
if (WIFEXITED (exit_status))
|
||||
{
|
||||
if (WEXITSTATUS (exit_status) != 0)
|
||||
{
|
||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||
"Exited with code %d", WEXITSTATUS (exit_status));
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
else if (WIFSIGNALED (exit_status))
|
||||
{
|
||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||
"Killed by signal %d", WTERMSIG (exit_status));
|
||||
goto out;
|
||||
}
|
||||
else
|
||||
{
|
||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||
"Exited abnormally");
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = TRUE;
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
||||
*
|
||||
* Copyright (C) 2011 Colin Walters <walters@verbum.org>.
|
||||
*
|
||||
* 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: Colin Walters <walters@verbum.org>
|
||||
*/
|
||||
|
||||
#ifndef __OSTREE_SPAWN_UTILS_H__
|
||||
#define __OSTREE_SPAWN_UTILS_H__
|
||||
|
||||
#include <gio/gio.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
gboolean ot_spawn_sync_checked (const char *cwd,
|
||||
char **argv,
|
||||
char **envp,
|
||||
GSpawnFlags flags,
|
||||
GSpawnChildSetupFunc child_setup,
|
||||
gpointer user_data,
|
||||
char **stdout_data,
|
||||
char **stderr_data,
|
||||
GError **error);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,41 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
||||
*
|
||||
* Copyright (C) 2011 Colin Walters <walters@verbum.org>
|
||||
*
|
||||
* 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: Colin Walters <walters@verbum.org>
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "otutil.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
void
|
||||
ot_ptrarray_add_many (GPtrArray *a, ...)
|
||||
{
|
||||
va_list args;
|
||||
void *p;
|
||||
|
||||
va_start (args, a);
|
||||
|
||||
while ((p = va_arg (args, void *)) != NULL)
|
||||
g_ptr_array_add (a, p);
|
||||
|
||||
va_end (args);
|
||||
}
|
||||
@@ -23,6 +23,8 @@
|
||||
#ifndef __OSTREE_UTIL_H__
|
||||
#define __OSTREE_UTIL_H__
|
||||
|
||||
#include <gio/gio.h>
|
||||
|
||||
#define ot_gobject_refz(o) (o ? g_object_ref (o) : o)
|
||||
#define ot_clear_checksum(c) G_STMT_START { \
|
||||
typeof(c) __tmp_chksum = c; \
|
||||
@@ -47,6 +49,9 @@
|
||||
#include <ot-opt-utils.h>
|
||||
#include <ot-unix-utils.h>
|
||||
#include <ot-variant-utils.h>
|
||||
#include <ot-spawn-utils.h>
|
||||
#include <ot-checksum-utils.h>
|
||||
|
||||
void ot_ptrarray_add_many (GPtrArray *a, ...) G_GNUC_NULL_TERMINATED;
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user