[ostree] main: ls: Behave like standard Unix "ls" with directories
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] main: ls: Behave like standard Unix "ls" with directories
- Date: Tue, 23 Jul 2013 22:42:54 +0000 (UTC)
commit 3ea62abe7546b9e929ddb02d74277b755be6a3c8
Author: Colin Walters <walters verbum org>
Date: Tue Jul 23 18:41:03 2013 -0400
main: ls: Behave like standard Unix "ls" with directories
Default to listing directory contents, add -d/--dironly to suppress
this.
src/ostree/ot-builtin-ls.c | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c
index c06f4c2..06087e4 100644
--- a/src/ostree/ot-builtin-ls.c
+++ b/src/ostree/ot-builtin-ls.c
@@ -26,12 +26,14 @@
#include "ostree.h"
#include "ostree-repo-file.h"
+static gboolean opt_dironly;
static gboolean opt_recursive;
static gboolean opt_checksum;
static gboolean opt_xattrs;
static gboolean opt_nul_filenames_only;
static GOptionEntry options[] = {
+ { "dironly", 'd', 0, G_OPTION_ARG_NONE, &opt_dironly, "Do not recurse into directory arguments", NULL },
{ "recursive", 'R', 0, G_OPTION_ARG_NONE, &opt_recursive, "Print directories recursively", NULL },
{ "checksum", 'C', 0, G_OPTION_ARG_NONE, &opt_checksum, "Print checksum", NULL },
{ "xattrs", 'X', 0, G_OPTION_ARG_NONE, &opt_xattrs, "Print extended attributes", NULL },
@@ -146,6 +148,7 @@ print_one_file (GFile *f,
static gboolean
print_directory_recurse (GFile *f,
+ int depth,
GError **error)
{
gboolean ret = FALSE;
@@ -154,6 +157,13 @@ print_directory_recurse (GFile *f,
gs_unref_object GFileInfo *child_info = NULL;
GError *temp_error = NULL;
+ if (depth > 0)
+ depth--;
+ else if (depth == 0)
+ return TRUE;
+ else
+ g_assert (depth == -1);
+
dir_enum = g_file_enumerate_children (f, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL,
@@ -170,7 +180,7 @@ print_directory_recurse (GFile *f,
if (g_file_info_get_file_type (child_info) == G_FILE_TYPE_DIRECTORY)
{
- if (!print_directory_recurse (child, error))
+ if (!print_directory_recurse (child, depth, error))
goto out;
}
@@ -233,10 +243,18 @@ ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancel
print_one_file (f, file_info);
- if (opt_recursive && g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
+ if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
{
- if (!print_directory_recurse (f, error))
- goto out;
+ if (opt_recursive)
+ {
+ if (!print_directory_recurse (f, -1, error))
+ goto out;
+ }
+ else if (!opt_dironly)
+ {
+ if (!print_directory_recurse (f, 1, error))
+ goto out;
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]