Add plutil and do some cleaning.

3 files changed, 169 insertions, 0 deletions

diff --git a/plutil/Makefile.am b/plutil/Makefile.am
new file mode 100644
index 0000000..aaa1dbc
--- /dev/null
+++ b/plutil/Makefile.am
@@ -0,0 +1,6 @@
+INCLUDES = -I$(top_srcdir)/include
+
+bin_PROGRAMS = plutil
+
+plutil_SOURCES = plutil.c
+plutil_LDADD = ../src/libplist.la
diff --git a/plutil/plutil.c b/plutil/plutil.c
new file mode 100644
index 0000000..ef22a77
--- /dev/null
+++ b/plutil/plutil.c
@@ -0,0 +1,135 @@
+/*
+ * plutil.C
+ * source for plist convertion tool
+ *
+ * Copyright (c) 2008 Zach C. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ */
+
+
+#include "plist/plist.h"
+#include "plutil.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+int main(int argc, char *argv[])
+{
+	struct stat *filestats = (struct stat *) malloc(sizeof(struct stat));
+	Options *options = parse_arguments(argc, argv);
+
+	if (!options) {
+		print_usage();
+		return 0;
+	}
+
+	iphone_set_debug(options->debug);
+
+	//read input file
+	FILE *iplist = fopen(options->in_file, "r");
+	if (!iplist)
+		return 1;
+	stat(options->in_file, filestats);
+	char *plist_entire = (char *) malloc(sizeof(char) * (filestats->st_size + 1));
+	fread(plist_entire, sizeof(char), filestats->st_size, iplist);
+	fclose(iplist);
+
+
+	//convert one format to another
+	plist_t root_node = NULL;
+	char *plist_out = NULL;
+	int size = 0;
+
+	if (memcmp(plist_entire, "bplist00", 8) == 0) {
+		plist_from_bin(plist_entire, filestats->st_size, &root_node);
+		plist_to_xml(root_node, &plist_out, &size);
+	} else {
+		plist_from_xml(plist_entire, filestats->st_size, &root_node);
+		plist_to_bin(root_node, &plist_out, &size);
+	}
+
+	if (plist_out) {
+		if (options->out_file != NULL) {
+			FILE *oplist = fopen(options->out_file, "wb");
+			if (!oplist)
+				return 1;
+			fwrite(plist_out, size, sizeof(char), oplist);
+			fclose(oplist);
+		}
+		//if no output file specified, write to stdout
+		else
+			fwrite(plist_out, size, sizeof(char), stdout);
+	} else
+		printf("ERROR\n");
+	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/plutil/plutil.h b/plutil/plutil.h
new file mode 100644
index 0000000..1455fb5
--- /dev/null
+++ b/plutil/plutil.h
@@ -0,0 +1,28 @@
+/*
+ * plutil.h
+ * header for plist convertion tool
+ *
+ * Copyright (c) 2008 Zach C. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ */
+
+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();