Commit cd95e9bc authored by Jonathan Beck's avatar Jonathan Beck

fix minor programming erro plus enhance plutil to convert bin to xml and xml to bin.

parent 62563320
...@@ -18,8 +18,6 @@ int main(int argc, char *argv[]) ...@@ -18,8 +18,6 @@ int main(int argc, char *argv[])
Options *options = parse_arguments(argc, argv); Options *options = parse_arguments(argc, argv);
int argh = 0; int argh = 0;
printf("plistutil version 0.2 written by FxChiP\n");
if (!options) { if (!options) {
print_usage(); print_usage();
return 0; return 0;
...@@ -31,26 +29,25 @@ int main(int argc, char *argv[]) ...@@ -31,26 +29,25 @@ int main(int argc, char *argv[])
stat(options->in_file, filestats); stat(options->in_file, filestats);
printf("here?\n");
char *bplist_entire = (char *) malloc(sizeof(char) * (filestats->st_size + 1)); 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); argh = fread(bplist_entire, sizeof(char), filestats->st_size, bplist);
printf("read %i bytes\n", argh);
fclose(bplist); fclose(bplist);
printf("or here?\n");
// bplist_entire contains our stuff // bplist_entire contains our stuff
plist_t root_node = NULL; plist_t root_node = NULL;
char *plist_out = NULL;
int size = 0;
if (memcmp(bplist_entire, "bplist00", 8) == 0) {
bin_to_plist(bplist_entire, filestats->st_size, &root_node); bin_to_plist(bplist_entire, filestats->st_size, &root_node);
printf("plutil debug mode\n\n"); plist_to_xml(root_node, &plist_out, &size);
printf("file size %i\n\n", (int) filestats->st_size); } else {
if (!root_node) { xml_to_plist(bplist_entire, filestats->st_size, &root_node);
printf("Invalid binary plist (or some other error occurred.)\n"); plist_to_bin(root_node, &plist_out, &size);
return 0;
} }
char *plist_xml = NULL;
int size = 0;
plist_to_xml(root_node, &plist_xml, &size); printf("%s\n", plist_out);
printf("%s\n", plist_xml);
return 0; return 0;
} }
......
...@@ -1014,16 +1014,16 @@ guint plist_data_hash(gconstpointer key) ...@@ -1014,16 +1014,16 @@ guint plist_data_hash(gconstpointer key)
case PLIST_REAL: case PLIST_REAL:
buff = (char *) &data->intval; buff = (char *) &data->intval;
size = 8; size = 8;
break;
case PLIST_KEY: case PLIST_KEY:
case PLIST_STRING: case PLIST_STRING:
buff = data->strval; buff = data->strval;
size = strlen(buff); size = strlen(buff);
break;
case PLIST_UNICODE: case PLIST_UNICODE:
buff = data->unicodeval; buff = data->unicodeval;
size = strlen(buff) * sizeof(wchar_t); size = strlen(buff) * sizeof(wchar_t);
break;
case PLIST_DATA: case PLIST_DATA:
case PLIST_ARRAY: case PLIST_ARRAY:
case PLIST_DICT: case PLIST_DICT:
...@@ -1267,7 +1267,7 @@ void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length) ...@@ -1267,7 +1267,7 @@ void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length)
uint8_t *buff = NULL; uint8_t *buff = NULL;
uint8_t size = 0; uint8_t size = 0;
uint64_t offsets[num_objects]; uint64_t offsets[num_objects];
for (i = 0; i <= num_objects; i++) { for (i = 0; i < num_objects; i++) {
offsets[i] = bplist_buff->len; offsets[i] = bplist_buff->len;
struct plist_data *data = (struct plist_data *) ((GNode *) g_ptr_array_index(objects, i))->data; struct plist_data *data = (struct plist_data *) ((GNode *) g_ptr_array_index(objects, i))->data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment