From 6710f4bfb980dd0fe6e75e4d6cba75532cde30e8 Mon Sep 17 00:00:00 2001 From: Jonathan Beck Date: Wed, 28 Oct 2009 18:31:34 +0100 Subject: Format sources to ANSI style using AStyle (astyle --style=ansi). --- plutil/plutil.c | 225 ++++++++++++++++++++++++++++++-------------------------- plutil/plutil.h | 13 ++-- 2 files changed, 127 insertions(+), 111 deletions(-) (limited to 'plutil') diff --git a/plutil/plutil.c b/plutil/plutil.c index 75cd3f1..e9eaef1 100644 --- a/plutil/plutil.c +++ b/plutil/plutil.c @@ -8,15 +8,15 @@ * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -35,114 +35,129 @@ int main(int argc, char *argv[]) { - FILE *iplist = NULL; - plist_t root_node = NULL; - char *plist_out = NULL; - int size = 0; - char *plist_entire = NULL; - struct stat *filestats = (struct stat *) malloc(sizeof(struct stat)); - Options *options = parse_arguments(argc, argv); - - if (!options) { - print_usage(); - free(filestats); - return 0; - } - //read input file - iplist = fopen(options->in_file, "rb"); - if (!iplist) - return 1; - stat(options->in_file, filestats); - 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 - - - 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); - } - plist_free(root_node); - free(plist_entire); - free(filestats); - - 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); - - free(plist_out); - } else - printf("ERROR\n"); - - free(options); - return 0; + FILE *iplist = NULL; + plist_t root_node = NULL; + char *plist_out = NULL; + int size = 0; + char *plist_entire = NULL; + struct stat *filestats = (struct stat *) malloc(sizeof(struct stat)); + Options *options = parse_arguments(argc, argv); + + if (!options) + { + print_usage(); + free(filestats); + return 0; + } + //read input file + iplist = fopen(options->in_file, "rb"); + if (!iplist) + return 1; + stat(options->in_file, filestats); + 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 + + + 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); + } + plist_free(root_node); + free(plist_entire); + free(filestats); + + 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); + + free(plist_out); + } + else + printf("ERROR\n"); + + free(options); + 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; + 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"); + 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 index 1455fb5..4be716e 100644 --- a/plutil/plutil.h +++ b/plutil/plutil.h @@ -8,20 +8,21 @@ * 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 + * 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; +typedef struct _options +{ + char *in_file, *out_file; + uint8_t debug, in_fmt, out_fmt; } Options; Options *parse_arguments(int argc, char *argv[]); -- cgit v1.1-32-gdbae