From 47b409bd9db9e40c113860e2d6a1b84cef6e2ebe Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Sun, 13 Mar 2011 14:06:54 -0400
Subject: [PATCH] upkg: Add an option to list packages.

This new option will eventually replace the dual-purpose "info" option.
---
 doc/man/upkg.1 |  4 +++-
 src/upkg.c     | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/doc/man/upkg.1 b/doc/man/upkg.1
index 3bc15d0..f3a1009 100644
--- a/doc/man/upkg.1
+++ b/doc/man/upkg.1
@@ -6,7 +6,7 @@
 .Nd manipulate UObject packages
 .Sh SYNOPSIS
 .Nm
-.Op Fl i Ns | Ns Fl x
+.Op Fl i Ns | Ns Fl l Ns | Ns Fl x
 .Op Fl v
 .Op Fl f Ar package
 .Op Ar object ...
@@ -15,6 +15,8 @@
 .It Fl i , -info
 Display information about a package.  More information is displayed at higher
 verbosity levels.
+.It Fl l , -list
+List objects belonging to a package.
 .It Fl x , -export
 Export all exportable objects from a package.
 .It Fl v , -verbose
diff --git a/src/upkg.c b/src/upkg.c
index 24df293..5912fc0 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -35,6 +35,7 @@
 
 enum {
 	MODE_INFO,
+	MODE_LIST,
 	MODE_EXPORT,
 	MODE_MAX
 };
@@ -42,9 +43,10 @@ enum {
 int verbose = 0;
 
 static const char *progname = "upkg";
-static const char *sopts = "ixvf:VH";
+static const char *sopts = "ilxvf:VH";
 static const struct option lopts[] = {
 	{ "info",     0, NULL, 'i' },
+	{ "list",     0, NULL, 'l' },
 	{ "export",   0, NULL, 'x' },
 	{ "file",     1, NULL, 'f' },
 	{ "verbose",  0, NULL, 'v' },
@@ -231,6 +233,29 @@ static void export_print_name(struct upkg *upkg, const struct upkg_export *e)
 	}
 }
 
+static void
+export_print_fullname(GTypeModule *pkg, const struct upkg_export *export)
+{
+	printf("%s", pkg->name);
+	export_print_name(U_PKG(pkg)->pkg, export);
+	putchar('\n');
+}
+
+static int package_list(GTypeModule *pkg, long parent)
+{
+	struct upkg *upkg = U_PKG(pkg)->pkg;
+	const struct upkg_export *export;
+
+	for (unsigned i = 0; i < upkg->export_count; i++) {
+		export = upkg_get_export(upkg, i);
+
+		if (export->package != parent)
+			continue;
+
+		export_print_fullname(pkg, export);
+	}
+}
+
 static int export_info(GTypeModule *pkg, unsigned long idx)
 {
 	struct upkg *upkg = U_PKG(pkg)->pkg;
@@ -238,10 +263,7 @@ static int export_info(GTypeModule *pkg, unsigned long idx)
 
 	export = upkg_get_export(upkg, idx);
 
-	printf("%s", pkg->name);
-	export_print_name(upkg, export);
-	putchar('\n');
-
+	export_print_fullname(pkg, export);
 	return 0;
 }
 
@@ -368,6 +390,9 @@ static int process_object(int mode, const char *objname)
 		else
 			ret = export_info(pkg, current);
 		break;
+	case MODE_LIST:
+		ret = package_list(pkg, current+1);
+		break;
 	case MODE_EXPORT:
 		ret = package_export(U_PKG(pkg)->pkg);
 		break;
@@ -406,6 +431,9 @@ int main(int argc, char **argv)
 		case 'i':
 			mode = MODE_INFO;
 			break;
+		case 'l':
+			mode = MODE_LIST;
+			break;
 		case 'x':
 			mode = MODE_EXPORT;
 			break;
-- 
2.43.0