X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/d3bcc750280bfce9a7f6e7ccf159400db9ad9659..4637e82e74fc0fabefda27f01073ccc1305f36b8:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 93b3c64..16f16b2 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ *  Copyright © 2009-2011 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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,16 +233,48 @@ 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);
+}
+
+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);
+
+		if (verbose >= 1) {
+			const char *class, *package;
+
+			class = upkg_export_class(upkg, i, &package);
+			printf(" (%s.%s)", package, class);
+		}
+
+		putchar('\n');
+	}
+}
+
 static int export_info(GTypeModule *pkg, unsigned long idx)
 {
 	struct upkg *upkg = U_PKG(pkg)->pkg;
 	const struct upkg_export *export;
+	const char *class, *package;
 
 	export = upkg_get_export(upkg, idx);
+	export_print_fullname(pkg, export);
 
-	printf("%s", pkg->name);
-	export_print_name(upkg, export);
-	putchar('\n');
+	class = upkg_export_class(upkg, idx, &package);
+	printf(" (%s.%s)\n", package, class);
 
 	return 0;
 }
@@ -368,6 +402,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 +443,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;