assembler: Put commandline args into structure

[b43-tools.git] / assembler / args.c

diff --git a/assembler/args.c b/assembler/args.c
index cf49460619c73537c9869b7793850d94795e1836..56707a1ac9e9d61e44f8879d63ff41679a939234 100644 (file)
--- a/assembler/args.c
+++ b/assembler/args.c
@@ -22,8 +22,13 @@
 #include <unistd.h>
 
 
-int _debug;
-bool arg_print_sizes;
+struct cmdline_args cmdargs = {
+       .debug                  = 0,
+       .print_sizes            = 0,
+       .initvals_fn_extension  = ".initvals",
+       .outformat              = FMT_B43,
+};
+
 
 #define ARG_MATCH              0
 #define ARG_NOMATCH            1
@@ -32,7 +37,7 @@ bool arg_print_sizes;
 static int do_cmp_arg(char **argv, int *pos,
                      const char *template,
                      int allow_merged,
-                     char **param)
+                     const char **param)
 {
        char *arg;
        char *next_arg;
@@ -61,7 +66,7 @@ static int do_cmp_arg(char **argv, int *pos,
                if (param) {
                        /* Skip the parameter on the next iteration. */
                        (*pos)++;
-                       if (*param == 0) {
+                       if (*param == NULL) {
                                fprintf(stderr, "%s needs a parameter\n", arg);
                                return ARG_ERROR;
                        }
@@ -76,7 +81,7 @@ static int do_cmp_arg(char **argv, int *pos,
 static int cmp_arg(char **argv, int *pos,
                   const char *long_template,
                   const char *short_template,
-                  char **param)
+                  const char **param)
 {
        int err;
 
@@ -93,17 +98,21 @@ static int cmp_arg(char **argv, int *pos,
 
 static void usage(int argc, char **argv)
 {
-       fprintf(stderr, "Usage: %s INPUT_FILE OUTPUT_FILE [OPTIONS]\n", argv[0]);
-       fprintf(stderr, "  -h|--help           Print this help\n");
-       fprintf(stderr, "  -d|--debug          Print verbose debugging info\n");
-       fprintf(stderr, "                      Repeat for more verbose debugging\n");
-       fprintf(stderr, "  -s|--psize          Print the size of the code after assembling\n");
+       printf("Usage: %s INPUT_FILE OUTPUT_FILE [OPTIONS]\n", argv[0]);
+       printf("  -f|--format FMT     Output file format. FMT must be one of:\n");
+       printf("                      raw-le32, raw-be32, b43\n");
+       printf("  -d|--debug          Print verbose debugging info\n");
+       printf("                      Repeat for more verbose debugging\n");
+       printf("  -s|--psize          Print the size of the code after assembling\n");
+       printf("  -e|--ivalext EXT    Filename extension for the initvals\n");
+       printf("  -h|--help           Print this help\n");
 }
 
 int parse_args(int argc, char **argv)
 {
        int i;
        int res;
+       const char *param;
 
        if (argc < 3)
                goto out_usage;
@@ -111,18 +120,40 @@ int parse_args(int argc, char **argv)
        outfile_name = argv[2];
 
        for (i = 3; i < argc; i++) {
-               if ((res = cmp_arg(argv, &i, "--help", "-h", 0)) == ARG_MATCH) {
+               if ((res = cmp_arg(argv, &i, "--help", "-h", NULL)) == ARG_MATCH) {
                        usage(argc, argv);
                        return 1;
-               } else if ((res = cmp_arg(argv, &i, "--debug", "-d", 0)) == ARG_MATCH) {
-                       _debug++;
-               } else if ((res = cmp_arg(argv, &i, "--psize", "-s", 0)) == ARG_MATCH) {
-                       arg_print_sizes = 1;
+               } else if ((res = cmp_arg(argv, &i, "--format", "-f", &param)) == ARG_MATCH) {
+                       if (strcasecmp(param, "raw-le32") == 0)
+                               cmdargs.outformat = FMT_RAW_LE32;
+                       else if (strcasecmp(param, "raw-be32") == 0)
+                               cmdargs.outformat = FMT_RAW_BE32;
+                       else if (strcasecmp(param, "b43") == 0)
+                               cmdargs.outformat = FMT_B43;
+                       else {
+                               fprintf(stderr, "Invalid -f|--format\n\n");
+                               goto out_usage;
+                       }
+               } else if ((res = cmp_arg(argv, &i, "--debug", "-d", NULL)) == ARG_MATCH) {
+                       cmdargs.debug++;
+               } else if ((res = cmp_arg(argv, &i, "--psize", "-s", NULL)) == ARG_MATCH) {
+                       cmdargs.print_sizes = 1;
+               } else if ((res = cmp_arg(argv, &i, "--ivalext", "-e", &param)) == ARG_MATCH) {
+                       cmdargs.initvals_fn_extension = param;
+               } else if ((res = cmp_arg(argv, &i, "--__real_infile", NULL, &param)) == ARG_MATCH) {
+                       cmdargs.real_infile_name = param;
                } else {
                        fprintf(stderr, "Unrecognized argument: %s\n", argv[i]);
                        goto out_usage;
                }
        }
+       if (!cmdargs.real_infile_name)
+               cmdargs.real_infile_name = infile_name;
+       if (strcmp(cmdargs.real_infile_name, outfile_name) == 0) {
+               fprintf(stderr, "Error: INPUT and OUTPUT filename must not be the same\n");
+               goto out_usage;
+       }
+
        return 0;
 out_usage:
        usage(argc, argv);