packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtins/cat: Port to new code style 

Definitely better.  Prep for another fix.

Closes: #915
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-07 14:45:42 -04:00 committed by Atomic Bot
parent 4418ab7fa9
commit 6b402e53f4
1 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/ostree/ot-builtin-cat.c
View File

@ -39,64 +39,45 @@ cat_one_file (GFile *f,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; g_autoptr(GInputStream) in = (GInputStream*)g_file_read (f, cancellable, error);
g_autoptr(GInputStream) in = NULL;
in = (GInputStream*)g_file_read (f, cancellable, error);
if (!in) if (!in)
goto out; return FALSE;
{ if (g_output_stream_splice (stdout_stream, in, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
gssize n_bytes_written = g_output_stream_splice (stdout_stream, in, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE, cancellable, error) < 0)
cancellable, error); return FALSE;
if (n_bytes_written < 0)
goto out;
}
ret = TRUE; return TRUE;
out:
return ret;
} }
gboolean gboolean
ostree_builtin_cat (int argc, char **argv, GCancellable *cancellable, GError **error) ostree_builtin_cat (int argc, char **argv, GCancellable *cancellable, GError **error)
{ {
g_autoptr(GOptionContext) context = NULL; g_autoptr(GOptionContext) context = g_option_context_new ("COMMIT PATH... - Concatenate contents of files");
glnx_unref_object OstreeRepo *repo = NULL; g_autoptr(OstreeRepo) repo = NULL;
gboolean ret = FALSE;
int i;
const char *rev;
g_autoptr(GOutputStream) stdout_stream = NULL;
g_autoptr(GFile) root = NULL;
g_autoptr(GFile) f = NULL;
context = g_option_context_new ("COMMIT PATH... - Concatenate contents of files");
if (!ostree_option_context_parse (context, options, &argc, &argv, OSTREE_BUILTIN_FLAG_NONE, &repo, cancellable, error)) if (!ostree_option_context_parse (context, options, &argc, &argv, OSTREE_BUILTIN_FLAG_NONE, &repo, cancellable, error))
goto out; return FALSE;
if (argc <= 2) if (argc <= 2)
{ {
ot_util_usage_error (context, "A COMMIT and at least one PATH argument are required", error); ot_util_usage_error (context, "A COMMIT and at least one PATH argument are required", error);
goto out; return FALSE;
} }
rev = argv[1]; const char *rev = argv[1];
g_autoptr(GFile) root = NULL;
if (!ostree_repo_read_commit (repo, rev, &root, NULL, NULL, error)) if (!ostree_repo_read_commit (repo, rev, &root, NULL, NULL, error))
goto out; return FALSE;
stdout_stream = g_unix_output_stream_new (1, FALSE); g_autoptr(GOutputStream) stdout_stream = g_unix_output_stream_new (1, FALSE);
for (i = 2; i < argc; i++) for (int i = 2; i < argc; i++)
{ {
g_clear_object (&f); g_autoptr(GFile) f = g_file_resolve_relative_path (root, argv[i]);
f = g_file_resolve_relative_path (root, argv[i]);
if (!cat_one_file (f, stdout_stream, cancellable, error)) if (!cat_one_file (f, stdout_stream, cancellable, error))
goto out; return FALSE;
} }
ret = TRUE; return TRUE;
out:
return ret;
} }