X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fargs.c;h=b2a8ddf1dd7df94eca42c86921eeee8123c687c9;hb=71af97ffe3ce1d598743b6c7a3707b8ac4ae9ba1;hp=52aa7c1ca5ffb5c6e671e64d9e44b5298263ca3f;hpb=b9e19faa25ad9e1b24f08dc77267760df1b98504;p=b43-tools.git

diff --git a/assembler/args.c b/assembler/args.c
index 52aa7c1..b2a8ddf 100644
--- a/assembler/args.c
+++ b/assembler/args.c
@@ -23,6 +23,10 @@
 
 
 int _debug;
+bool arg_print_sizes;
+const char *initvals_fn_extension = ".initvals";
+static const char *real_infile_name;
+
 
 #define ARG_MATCH		0
 #define ARG_NOMATCH		1
@@ -31,7 +35,7 @@ int _debug;
 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;
@@ -60,7 +64,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;
 			}
@@ -75,7 +79,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;
 
@@ -92,10 +96,12 @@ 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");
+	printf("Usage: %s INPUT_FILE OUTPUT_FILE [OPTIONS]\n", argv[0]);
+	printf("  -h|--help           Print this help\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");
 }
 
 int parse_args(int argc, char **argv)
@@ -109,15 +115,29 @@ 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) {
-			goto out_usage;
-		} else if ((res = cmp_arg(argv, &i, "--debug", "-d", 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", NULL)) == ARG_MATCH) {
 			_debug++;
+		} else if ((res = cmp_arg(argv, &i, "--psize", "-s", NULL)) == ARG_MATCH) {
+			arg_print_sizes = 1;
+		} else if ((res = cmp_arg(argv, &i, "--ivalext", "-e", &initvals_fn_extension)) == ARG_MATCH) {
+			/* initvals_fn_extension is set to the extension. */
+		} else if ((res = cmp_arg(argv, &i, "--__real_infile", NULL, &real_infile_name)) == ARG_MATCH) {
+			/* real_infile_name is set. */
 		} else {
 			fprintf(stderr, "Unrecognized argument: %s\n", argv[i]);
 			goto out_usage;
 		}
 	}
+	if (!real_infile_name)
+		real_infile_name = infile_name;
+	if (strcmp(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);