X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/1906020cf2abc26cf8317a5a754dca7318802250..7b7fa9198e6872739a50374aebe61b6444611438:/src/upkg.c
diff --git a/src/upkg.c b/src/upkg.c
index ef44bf6..19f1449 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -2,9 +2,9 @@
* upkg: tool for manipulating Unreal Tournament packages.
* Copyright (C) 2009 Nick Bowler
*
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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,
@@ -13,8 +13,7 @@
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see .
*/
#include
@@ -25,10 +24,12 @@
#include
#include "upkg.h"
-#include "module.h"
-#include "uobject.h"
-#include "exportable.h"
-#include "loadable.h"
+#include
+#include
+#include
+#include
+#include
+#include
enum {
MODE_INFO,
@@ -39,10 +40,11 @@ enum {
int verbose = 0;
static const char *progname = "upkg";
-static const char *sopts = "ixvVH";
+static const char *sopts = "ixvf:VH";
static const struct option lopts[] = {
{ "info", 0, NULL, 'i' },
{ "export", 0, NULL, 'x' },
+ { "file", 1, NULL, 'f' },
{ "verbose", 0, NULL, 'v' },
{ "version", 0, NULL, 'V' },
{ "help", 0, NULL, 'H' },
@@ -54,6 +56,7 @@ 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."
);
@@ -61,7 +64,7 @@ There is NO WARRANTY, to the extent permitted by law."
void print_usage(FILE *f)
{
- fprintf(f, "Usage: %s [options] package\n", progname);
+ fprintf(f, "Usage: %s [options]\n", progname);
}
void print_help(void)
@@ -82,7 +85,7 @@ void print_help(void)
}
}
-void print_upkg_flags(const char *prefix, unsigned long flags)
+static void print_upkg_flags(const char *prefix, unsigned long flags)
{
if (flags & UPKG_FLAG_ALLOW_DOWNLOAD)
printf("%sAllowDownload\n", prefix);
@@ -98,6 +101,70 @@ void print_upkg_flags(const char *prefix, unsigned long flags)
printf("%sRequired\n", prefix);
}
+static void print_upkg_object_flags(const char *prefix, unsigned long flags)
+{
+ if (flags & UPKG_OBJ_FLAG_TRANSACTIONAL)
+ printf("%sTransactional\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_UNREACHABLE)
+ printf("%sUnreachable\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_PUBLIC)
+ printf("%sPublic\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_TAG_IMPORT)
+ printf("%sImport\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_TAG_EXPORT)
+ printf("%sTagExport\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_SOURCE_MODIFIED)
+ printf("%sSourceModified\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_TAG_GARBAGE)
+ printf("%sTagGarbage\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_NEED_LOAD)
+ printf("%sNeedLoad\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_HIGHLIGHT_NAME)
+ printf("%sHighlightName\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_IN_SINGULAR_FUNC)
+ printf("%sInSingularFunc\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_SUPPRESSED)
+ printf("%sSuppressed\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_IN_END_STATE)
+ printf("%sInEndState\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_TRANSIENT)
+ printf("%sTransient\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_PRELOADING)
+ printf("%sPreloading\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_LOAD_FOR_CLIENT)
+ printf("%sLoadForClient\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_LOAD_FOR_SERVER)
+ printf("%sLoadForServer\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_LOAD_FOR_EDIT)
+ printf("%sLoadForEdit\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_STANDALONE)
+ printf("%sStandalone\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_NOT_FOR_CLIENT)
+ printf("%sNotForClient\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_NOT_FOR_SERVER)
+ printf("%sNotForServer\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_NOT_FOR_EDIT)
+ printf("%sNotForEdit\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_DESTROYED)
+ printf("%sDestroyed\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_NEED_POST_LOAD)
+ printf("%sNeedPostLoad\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_HAS_STACK)
+ printf("%sHasStack\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_NATIVE)
+ printf("%sNative\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_MARKED)
+ printf("%sMarked\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_ERROR_SHUTDOWN)
+ printf("%sErrorShutdown\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_DEBUG_POST_LOAD)
+ printf("%sDebugPostLoad\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_DEBUG_SERIALIZE)
+ printf("%sDebugSerialize\n", prefix);
+ if (flags & UPKG_OBJ_FLAG_DEBUG_DESTROY)
+ printf("%sDebugDestroy\n", prefix);
+}
+
void print_guid(unsigned char guid[static 16])
{
for (unsigned i = 0; i < 16; i++) {
@@ -121,6 +188,10 @@ void print_upkg_exports(struct upkg *pkg)
continue;
printf("%u - %s (%s.%s)\n", i+1, name, package, class);
+ printf(" Flags: %lx\n", upkg_export_flags(pkg, i));
+ if (verbose >= 2) {
+ print_upkg_object_flags(" ", upkg_export_flags(pkg, i));
+ }
}
}
@@ -132,16 +203,14 @@ int package_info(struct upkg *pkg)
print_guid(pkg->guid);
printf("Flags: %lx\n", pkg->flags);
- if (verbose >= 1) {
- print_upkg_flags("\t", pkg->flags);
+ if (verbose >= 2) {
+ print_upkg_flags(" ", pkg->flags);
}
- if (verbose >= 1) {
- printf("Names: %lu\n", pkg->name_count);
- if (verbose >= 2) {
- for (unsigned long i = 0; i < pkg->name_count; i++) {
- printf("\t%s\n", upkg_get_name(pkg, i));
- }
+ printf("Names: %lu\n", pkg->name_count);
+ if (verbose >= 3) {
+ for (unsigned long i = 0; i < pkg->name_count; i++) {
+ printf("\t%s\n", upkg_get_name(pkg, i));
}
}
@@ -202,7 +271,7 @@ int package_export(struct upkg *pkg)
return EXIT_FAILURE;
}
- type = module_get_class(package, class);
+ type = u_object_module_get_class(package, class);
if (!type) continue;
obj = g_object_new(type, NULL);
@@ -219,14 +288,27 @@ int package_export(struct upkg *pkg)
int main(int argc, char **argv)
{
- struct upkg *pkg;
+ GTypeModule *pkg;
+ const char *pkgname = NULL;
unsigned mode = MODE_INFO;
int opt, rc = EXIT_FAILURE;
if (argc > 0) progname = argv[0];
+ if (u_pkg_vfs_init() != 0)
+ return EXIT_FAILURE;
+ if (u_object_module_init() != 0)
+ return EXIT_FAILURE;
+
while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
switch (opt) {
+ case 'f':
+ pkgname = u_pkg_vfs_add_local(NULL, optarg);
+ if (!pkgname) {
+ fprintf(stderr, "failed to add package `%s'.\n", optarg);
+ return EXIT_FAILURE;
+ }
+ break;
case 'i':
mode = MODE_INFO;
break;
@@ -248,30 +330,41 @@ int main(int argc, char **argv)
}
}
- if (argv[optind] == NULL) {
+ if (!pkgname) {
print_usage(stderr);
return EXIT_FAILURE;
}
- if (module_init() != 0)
+ pkg = u_pkg_open(pkgname);
+ if (!pkg || !g_type_module_use(pkg)) {
+ fprintf(stderr, "%s: %s: failed to open package.\n",
+ progname, pkgname);
return EXIT_FAILURE;
+ }
+
+ if (!U_PKG(pkg)->pkg) {
+ if (u_pkg_is_native(pkg)) {
+ fprintf(stderr, "%s: %s: not a UObject package.\n",
+ progname, pkgname);
+ } else {
+ fprintf(stderr, "%s: %s: package not found.\n",
+ progname, pkgname);
+ }
- pkg = upkg_fopen(argv[optind]);
- if (!pkg) {
- fprintf(stderr, "failed to open package!\n");
return EXIT_FAILURE;
}
switch (mode) {
case MODE_INFO:
- rc = package_info(pkg);
+ rc = package_info(U_PKG(pkg)->pkg);
break;
case MODE_EXPORT:
- rc = package_export(pkg);
+ rc = package_export(U_PKG(pkg)->pkg);
break;
}
- upkg_close(pkg);
- module_exit();
+ g_type_module_unuse(pkg);
+ u_object_module_exit();
+ u_pkg_vfs_exit();
return rc;
}