X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/45c92fd47dad10216eb2589b81f35a13cd1837f5..HEAD:/src/upkg.c
diff --git a/src/upkg.c b/src/upkg.c
index 7448aba..db9a747 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -1,19 +1,19 @@
/*
- * upkg: tool for manipulating Unreal Tournament packages.
- * Copyright © 2009-2011 Nick Bowler
+ * upkg: tool for manipulating Unreal Tournament packages.
+ * Copyright © 2009-2012, 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program 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 General Public License for more details.
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*/
#include
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -33,6 +34,8 @@
#include
#include
+#include "help.h"
+
enum {
MODE_INFO,
MODE_LIST,
@@ -43,50 +46,49 @@ enum {
int verbose = 0;
static const char *progname = "upkg";
-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' },
- { "version", 0, NULL, 'V' },
- { "help", 0, NULL, 'H' },
- { 0 }
-};
-void print_version(void)
+#include "upkgopts.h"
+static const char sopts[] = SOPT_STRING;
+static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
+
+static void print_version(void)
{
printf("%s\n", PACKAGE_STRING);
- puts("\
-Copyright (C) 2009 Nick Bowler.\n\
-License GPLv3+: GNU GPL version 3 or later .\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law."
- );
+ puts("Copyright (C) 2022 Nick Bowler.");
+ puts("License GPLv3+: GNU GPL version 3 or any later version.");
+ puts("This is free software: you are free to change and redistribute it.");
+ puts("There is NO WARRANTY, to the extent permitted by law.");
}
-void print_usage(FILE *f)
+static void print_usage(FILE *f)
{
fprintf(f, "Usage: %s [options] [object ...]\n", progname);
+ if (f != stdout)
+ fprintf(f, "Try %s --help for more information.\n", progname);
}
-void print_help(void)
+static void print_help(void)
{
+ const struct option *opt;
+
print_usage(stdout);
- puts("Detailed help coming soon. Until then, I'll just list my options.");
- for (unsigned i = 0; lopts[i].name; i++) {
- const struct option *o = &lopts[i];
- printf("\t--%s", o->name);
-
- if (o->has_arg == 1) {
- printf("=val");
- } else if (o->has_arg == 2) {
- printf("[=val]");
- }
- printf(" (-%c)\n", o->val);
+ putchar('\n');
+ puts("Options:");
+ for (opt = lopts; opt->name; opt++) {
+ struct lopt_help help;
+
+ if (!lopt_get_help(opt, &help))
+ continue;
+
+ help_print_option(opt, help.arg, help.desc, 20);
}
+ putchar('\n');
+
+ puts("For more information, see the upkg(1) man page.");
+ putchar('\n');
+
+ printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
}
static void print_upkg_flags(const char *prefix, unsigned long flags)
@@ -169,7 +171,7 @@ static void print_upkg_object_flags(const char *prefix, unsigned long flags)
printf("%sDebugDestroy\n", prefix);
}
-void print_guid(unsigned char guid[static 16])
+static void print_guid(unsigned char *guid)
{
for (unsigned i = 0; i < 16; i++) {
printf("%02hhx", guid[i]);
@@ -180,18 +182,64 @@ void print_guid(unsigned char guid[static 16])
}
}
-void print_upkg_exports(struct upkg *pkg)
+static void export_print_name(const struct upkg_export *e)
{
- for (unsigned i = 0; i < pkg->export_count; i++) {
- const struct upkg_export *export = upkg_get_export(pkg, i);
- const char *package, *class;
+ if (e) {
+ export_print_name(e->parent);
+ printf(".%s", e->name);
+ }
+}
- class = upkg_export_class(pkg, i, &package);
+static void
+export_print_fullname(GTypeModule *pkg, const struct upkg_export *export)
+{
+ printf("%s", pkg->name);
+ export_print_name(export);
+}
- if (!class)
- continue;
+static void import_print_fullname(const struct upkg_import *import)
+{
+ if (import) {
+ import_print_fullname(import->parent);
+ if (import->parent)
+ putchar('.');
+ printf("%s", import->name);
+ }
+}
+
+static void
+export_print_class(GTypeModule *pkg, const struct upkg_export *export)
+{
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+
+ if (export->class < 0) {
+ const struct upkg_import *class;
+
+ class = upkg_get_import(upkg, -(export->class+1));
+ import_print_fullname(class);
+ } else if (export->class > 0) {
+ const struct upkg_export *class;
+
+ class = upkg_get_export(upkg, export->class-1);
+ export_print_fullname(pkg, class);
+ } else {
+ printf("Core.Class");
+ }
+}
+
+void print_upkg_exports(GTypeModule *pkg)
+{
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+
+ for (unsigned i = 0; i < upkg->export_count; i++) {
+ const struct upkg_export *export = upkg_get_export(upkg, i);
+
+ printf("%u - ", i+1);
+ export_print_fullname(pkg, export);
+ printf(" (");
+ export_print_class(pkg, export);
+ printf(")\n");
- printf("%u - %s (%s.%s)\n", i+1, export->name, package, class);
printf(" Flags: %lx\n", export->flags);
if (verbose >= 2) {
print_upkg_object_flags(" ", export->flags);
@@ -199,65 +247,68 @@ void print_upkg_exports(struct upkg *pkg)
}
}
-int package_info(struct upkg *pkg)
+void print_upkg_imports(struct upkg *pkg)
{
- printf("Version: %u\n", pkg->version);
- printf("License: %u\n", pkg->license);
+ for (unsigned i = 0; i < pkg->import_count; i++) {
+ const struct upkg_import *import = upkg_get_import(pkg, i);
+
+ printf("%u - ", i);
+ import_print_fullname(import);
+ printf(" (%s.%s)\n", import->class_package, import->class_name);
+ }
+}
+
+int package_info(GTypeModule *pkg)
+{
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+
+ printf("Version: %u\n", upkg->version);
+ printf("License: %u\n", upkg->license);
printf("GUID: ");
- print_guid(pkg->guid);
+ print_guid(upkg->guid);
- printf("Flags: %lx\n", pkg->flags);
+ printf("Flags: %lx\n", upkg->flags);
if (verbose >= 2) {
- print_upkg_flags(" ", pkg->flags);
+ print_upkg_flags(" ", upkg->flags);
}
- printf("Names: %lu\n", pkg->name_count);
+ printf("Names: %lu\n", upkg->name_count);
if (verbose >= 3) {
- for (unsigned long i = 0; i < pkg->name_count; i++) {
- printf("\t%s\n", upkg_get_name(pkg, i));
+ for (unsigned long i = 0; i < upkg->name_count; i++) {
+ printf("%lu - %s\n", i, upkg_get_name(upkg, i));
}
}
- printf("Exports: %lu\n", pkg->export_count);
+ printf("Exports: %lu\n", upkg->export_count);
if (verbose >= 1) print_upkg_exports(pkg);
- printf("Imports: %lu\n", pkg->import_count);
+ printf("Imports: %lu\n", upkg->import_count);
+ if (verbose >= 1) print_upkg_imports(upkg);
return 0;
}
-static void export_print_name(struct upkg *upkg, const struct upkg_export *e)
-{
- if (e) {
- export_print_name(upkg, upkg_get_export(upkg, e->package-1));
- printf(".%s", e->name);
- }
-}
-
-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)
+static int package_list(GTypeModule *pkg, long current)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
- const struct upkg_export *export;
+ const struct upkg_export *parent = NULL;
+
+ if (current >= 0) {
+ parent = upkg_get_export(upkg, current);
+ assert(parent != NULL);
+ }
for (unsigned i = 0; i < upkg->export_count; i++) {
- export = upkg_get_export(upkg, i);
+ const struct upkg_export *export = upkg_get_export(upkg, i);
- if (export->package != parent)
+ if (export->parent != 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);
+ printf(" (");
+ export_print_class(pkg, export);
+ printf(")");
}
putchar('\n');
@@ -266,68 +317,89 @@ static int package_list(GTypeModule *pkg, long parent)
return 0;
}
-static int object_info(GTypeModule *pkg, unsigned long idx)
+static int object_dump_properties(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);
+ GParamSpec **props;
+ GObject *obj;
+ unsigned n;
- class = upkg_export_class(upkg, idx, &package);
- printf(" (%s.%s)\n", package, class);
+ obj = u_object_new_from_package(pkg, idx);
+ if (!obj) {
+ fprintf(stderr, "%s: failed to load object.\n", progname);
+ return -1;
+ }
- /* Print out object properties. */
- if (verbose >= 1) {
- GParamSpec **props;
- GObject *obj;
- unsigned n;
+ props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
+ for (unsigned i = 0; i < n; i++) {
+ GValue val = {0};
+ char *valstr;
- obj = u_object_new_from_package(upkg, idx);
- if (!obj) {
- fprintf(stderr, "%s: failed to load object.\n",
- progname);
- return -1;
- }
+ printf(" property %s:", props[i]->name);
+ fflush(stdout);
- props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
- for (unsigned i = 0; i < n; i++) {
- GValue val = {0};
- char *valstr;
+ g_value_init(&val, props[i]->value_type);
+ g_object_get_property(obj, props[i]->name, &val);
- printf(" property %s: ", props[i]->name);
- fflush(stdout);
+ if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
+ UObject *obj = g_value_get_object(&val);
- g_value_init(&val, props[i]->value_type);
- g_object_get_property(obj, props[i]->name, &val);
- valstr = g_strdup_value_contents(&val);
- printf("%s\n", valstr);
+ if (obj && obj->pkg_name) {
+ printf(" %s", obj->pkg_name);
+ }
}
- free(props);
- g_object_unref(obj);
+ valstr = g_strdup_value_contents(&val);
+ printf(" %s\n", valstr);
+ g_free(valstr);
}
- /* Print raw file info. */
- if (verbose >= 3) {
- struct upkg_file *f = upkg_export_open(upkg, idx);
- if (!f) {
- fprintf(stderr, "%s: failed to open export.\n",
- progname);
- return -1;
- }
+ g_free(props);
+ g_object_unref(obj);
+
+ return 0;
+}
- printf(" file size: %lu\n", f->len);
- printf(" file start: %#lx\n", f->base);
- printf(" file end: %#lx\n", f->base + f->len);
+static int object_dump_offsets(GTypeModule *pkg, unsigned long idx)
+{
+ struct upkg_file *f;
- upkg_export_close(f);
+ f = upkg_export_open(U_PKG(pkg)->pkg, idx);
+ if (!f) {
+ fprintf(stderr, "%s: failed to open export.\n", progname);
+ return -1;
}
+ printf(" file size: %lu\n", f->len);
+ printf(" file start: %#lx\n", f->base);
+ printf(" file end: %#lx\n", f->base + f->len);
+
+ upkg_export_close(f);
+
return 0;
}
+static int object_info(GTypeModule *pkg, unsigned long idx)
+{
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+ const struct upkg_export *export;
+ int ret = 0;
+
+ export = upkg_get_export(upkg, idx);
+ export_print_fullname(pkg, export);
+
+ printf(" (");
+ export_print_class(pkg, export);
+ printf(")\n");
+
+ if (verbose >= 1 && object_dump_properties(pkg, idx) != 0)
+ ret = -1;
+
+ if (verbose >= 3 && object_dump_offsets(pkg, idx))
+ ret = -1;
+
+ return ret;
+}
+
static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
@@ -336,6 +408,7 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
int rc;
if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+ fprintf(stderr, "%s: failed to load export data.\n", progname);
return -1;
}
@@ -373,11 +446,10 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
static int object_export(GTypeModule *pkg, unsigned long idx)
{
- struct upkg *upkg = U_PKG(pkg)->pkg;
GObject *obj;
int ret = -1;
- obj = u_object_new_from_package(upkg, idx);
+ obj = u_object_new_from_package(pkg, idx);
if (!obj) {
fprintf(stderr, "%s: failed to load object.\n", progname);
return -1;
@@ -397,28 +469,13 @@ out:
int package_export(GTypeModule *pkg)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
- const char *class, *package;
GObject *obj;
- GType type;
int ret = 0;
for (unsigned i = 0; i < upkg->export_count; i++) {
- class = upkg_export_class(upkg, i, &package);
- if (!class) {
- fprintf(stderr, "error getting class information.\n");
- return -1;
- }
-
- type = u_object_module_get_class(package, class);
- if (!type)
- continue;
-
- obj = g_object_new(type, NULL);
- if (U_OBJECT_IS_EXPORTABLE(obj)) {
- if (u_object_deserialize(obj, upkg, i) != 0
- || export(pkg, obj, i) != 0) {
- ret = -1;
- }
+ obj = u_object_new_from_package(pkg, i);
+ if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) {
+ ret = -1;
}
g_object_unref(obj);
}
@@ -479,12 +536,12 @@ static int process_object(int mode, const char *objname)
switch (mode) {
case MODE_INFO:
if (current < 0)
- ret = package_info(U_PKG(pkg)->pkg);
+ ret = package_info(pkg);
else
ret = object_info(pkg, current);
break;
case MODE_LIST:
- ret = package_list(pkg, current+1);
+ ret = package_list(pkg, current);
break;
case MODE_EXPORT:
if (current < 0)