Added binary-plist support (tweaked slightly to move stuff around)

Signed-off-by: Matt Colyer <matt@colyer.name>

fix makefile to take correct main function into account

3 files changed, 191 insertions, 2 deletions

diff --git a/dev/Makefile.am b/dev/Makefile.am
index 4833728..95b4d61 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/include
 AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g
 AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
 
-bin_PROGRAMS = iphoneclient lckd-client afccheck
+bin_PROGRAMS = iphoneclient lckd-client afccheck plutil
 
 iphoneclient_SOURCES = main.c
 iphoneclient_LDADD = ../src/libiphone.la
@@ -16,4 +16,9 @@ lckd_client_LDADD = ../src/libiphone.la
 afccheck_SOURCES = afccheck.c
 afccheck_CFLAGS = $(AM_CFLAGS)
 afccheck_LDFLAGS = $(AM_LDFLAGS)
-afccheck_LDADD = ../src/libiphone.la
\ No newline at end of file
+afccheck_LDADD = ../src/libiphone.la
+
+plutil_SOURCES = plutil.c
+plutil_CFLAGS = $(AM_CFLAGS)
+plutil_LDFLAGS = $(AM_LDFLAGS)
+plutil_LDADD = ../src/libiphone.la
diff --git a/dev/plutil.c b/dev/plutil.c
new file mode 100644
index 0000000..208d7df
--- /dev/null
+++ b/dev/plutil.c
@@ -0,0 +1,171 @@
+/*
+ * main.c for plistutil
+ * right now just prints debug shit
+ */
+
+#include "../src/plist.h"
+#include "plutil.h"
+
+int debug = 0;
+
+void print_nodes(bplist_node *root_node) {
+	// Yay, great. Let's print the list of nodes recursively...
+	int i = 0;
+	if (!root_node) return; // or not, because the programmer's stupid.
+	
+	switch (root_node->type) {
+		case BPLIST_DICT:
+			printf("Dictionary node.\nLength %i\n", root_node->length);
+			for (i = 0; i < (root_node->length * 2); i+=2) {
+				// HI!
+				printf("Key: ");
+				print_nodes(root_node->subnodes[i]);
+				printf("Value: ");
+				print_nodes(root_node->subnodes[i+1]);
+			}
+			printf("End dictionary node.\n\n");
+			break;
+		
+		case BPLIST_ARRAY:
+			printf("Array node.\n");
+			for (i = 0; i < root_node->length; i++) {
+				printf("\tElement %i: ", i);
+				print_nodes(root_node->subnodes[i]);
+			}
+			break;
+			
+		case BPLIST_INT:
+			if (root_node->length == sizeof(uint8_t)) {
+				printf("Integer: %i\n", root_node->intval8);
+			} else if (root_node->length == sizeof(uint16_t)) {
+				printf("Integer: %i\n", root_node->intval16);
+			} else if (root_node->length == sizeof(uint32_t)) {
+				printf("Integer: %i\n", root_node->intval32);
+			}
+			break;
+		
+		case BPLIST_STRING:
+		case BPLIST_DATA:
+			printf("String/data: ");
+			fwrite(root_node->strval, sizeof(char), root_node->length, stdout);
+			fflush(stdout);
+			printf("\n");
+			break;
+		
+		case BPLIST_UNICODE:
+			printf("Unicode data, may appear crappy: ");
+			fwrite(root_node->unicodeval, sizeof(wchar_t), root_node->length, stdout);
+			fflush(stdout);
+			printf("\n");
+			break;
+		
+		case BPLIST_TRUE:
+			printf("True.\n");
+			break;
+		
+		case BPLIST_FALSE:
+			printf("False.\n");
+			break;
+		
+		case BPLIST_REAL:
+		case BPLIST_DATE:
+			printf("Real(?): %f\n", root_node->realval);
+			break;
+			
+		default:
+			printf("oops\nType set to %x and length is %i\n", root_node->type, root_node->length);
+			break;
+	}
+}
+
+int main(int argc, char *argv[]) {
+	struct stat *filestats = (struct stat *)malloc(sizeof(struct stat));
+	uint32_t position = 0;
+	Options *options = parse_arguments(argc, argv);
+	int argh = 0;
+	
+	printf("plistutil version 0.2 written by FxChiP\n");
+	
+	if (!options) {
+		print_usage();
+		return 0;
+	}
+
+	debug = options->debug;
+	
+	FILE *bplist = fopen(options->in_file, "r");
+	
+	stat(options->in_file, filestats);
+
+	printf("here?\n");
+	char *bplist_entire = (char*)malloc(sizeof(char) * (filestats->st_size + 1));
+	//argh = fgets(bplist_entire, filestats->st_size, bplist);
+	argh = fread(bplist_entire, sizeof(char), filestats->st_size, bplist);
+	printf("read %i bytes\n", argh);
+	fclose(bplist);
+	printf("or here?\n");
+	// bplist_entire contains our stuff
+	 bplist_node *root_node;
+	 root_node = parse_nodes(bplist_entire, filestats->st_size, &position);
+	 printf("plutil debug mode\n\n");
+	 printf("file size %i\n\n", filestats->st_size);
+	 if (!root_node) {
+	 	printf("Invalid binary plist (or some other error occurred.)\n");
+	 	return 0;
+	}
+	 print_nodes(root_node);
+	 return 0;
+ }
+
+Options *parse_arguments(int argc, char *argv[]) {
+	int i = 0;
+	
+	Options *options = (Options*)malloc(sizeof(Options));
+	memset(options, 0, sizeof(Options));
+	
+	for (i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "--infile") || !strcmp(argv[i], "-i")) {
+			if ((i+1) == argc) {
+				free(options);
+				return NULL;
+			}
+			options->in_file = argv[i+1];
+			i++;
+			continue;
+		}
+		
+		if (!strcmp(argv[i], "--outfile") || !strcmp(argv[i], "-o")) {
+			if ((i+1) == argc) {
+				free(options);
+				return NULL;
+			}
+			options->out_file = argv[i+1];
+			i++;
+			continue;
+		}
+		
+		if (!strcmp(argv[i], "--debug") || !strcmp(argv[i], "-d") || !strcmp(argv[i], "-v")) {
+			options->debug = 1;
+		}
+		
+		if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) {
+			free(options);
+			return NULL;
+		}
+	}
+	
+	if (!options->in_file /*|| !options->out_file*/) {
+		free(options);
+		return NULL;
+	}
+	
+	return options;
+}
+
+void print_usage() {
+	printf("Usage: plistutil -i|--infile in_file.plist -o|--outfile out_file.plist [--debug]\n");
+	printf("\n");
+	printf("\t-i or --infile: The file to read in.\n");
+	printf("\t-o or --outfile: The file to convert to.\n");
+	printf("\t-d, -v or --debug: Provide extended debug information.\n\n");
+}
diff --git a/dev/plutil.h b/dev/plutil.h
new file mode 100644
index 0000000..2146307
--- /dev/null
+++ b/dev/plutil.h
@@ -0,0 +1,13 @@
+
+/* 
+ * main.h - header for plistutil
+ * Written by FxChiP
+ */
+
+typedef struct _options {
+	char *in_file, *out_file;
+	uint8_t debug, in_fmt, out_fmt;
+} Options;
+
+Options *parse_arguments(int argc, char *argv[]);
+void print_usage();