unprotbas: exit status 2 for unprotected program; add -c (check only).

1 files changed, 32 insertions, 15 deletions

diff --git a/unprotbas.c b/unprotbas.c
index 8dc6844..845c75b 100644
--- a/unprotbas.c
+++ b/unprotbas.c
@@ -42,6 +42,8 @@ char *self;
 int keepvars = 0;
 int forcevars = 0;
 int keepgarbage = 1;
+int checkonly = 0;
+int was_protected = 0;
 int verbose = 0;
 
 /* file handles */
@@ -57,6 +59,7 @@ void die(const char *msg) {
 int readfile(void) {
 	int got = fread(data, 1, 65535, input_file);
 	fprintf(stderr, "read %d bytes\n", got);
+	fclose(input_file);
 	return got;
 }
 
@@ -369,6 +372,7 @@ void print_help(void) {
 	fprintf(stderr, "-f: force variable name table rebuild\n");
 	fprintf(stderr, "-n: do not rebuild variable name table, even if it's invalid\n");
 	fprintf(stderr, "-g: remove trailing garbage, if present\n");
+	fprintf(stderr, "-c: check only; no output file\n");
 	fprintf(stderr, "Use - as a filename to read from stdin and/or write to stdout\n");
 }
 
@@ -432,6 +436,7 @@ void parse_args(int argc, char **argv) {
 				case 'f': forcevars++; break;
 				case 'n': keepvars++; break;
 				case 'g': keepgarbage = 0; break;
+				case 'c': checkonly = 1; break;
 				case 0:
 							 if(!input_file)
 								 open_input(NULL);
@@ -445,7 +450,7 @@ void parse_args(int argc, char **argv) {
 		} else {
 			if(!input_file)
 				open_input(*argv);
-			else if(!output_file)
+			else if(!checkonly && !output_file)
 				open_output(*argv);
 			else
 				invalid_args(*argv);
@@ -453,7 +458,7 @@ void parse_args(int argc, char **argv) {
 	}
 
 	if(!input_file) die("no input file given (use - for stdin)");
-	if(!output_file) die("no output file given (use - for stdout)");
+	if(!checkonly && !output_file) die("no output file given (use - for stdout)");
 	if(keepvars && forcevars) die("-f and -n are mutually exclusive");
 }
 
@@ -465,26 +470,38 @@ int main(int argc, char **argv) {
 
 	if(lomem) die("This doesn't look like an Atari BASIC program (no $0000 signature)");
 
-	/*
-	fprintf(stderr, "data at STMTAB (we hope):\n");
-	for(int i=codestart; i<filelen; i++) {
-		fprintf(stderr, "%02x ", data[i]);
-	}
-	fprintf(stderr, "\n");
-	*/
-
 	if(!keepvars) {
-		if(fixvars())
+		if(fixvars()) {
+			was_protected = 1;
 			fprintf(stderr, "Variable names replaced\n");
-		else
+		} else {
 			fprintf(stderr, "Variable names were already OK\n");
+		}
 	}
 
-	if(fixcode())
+	if(fixcode()) {
 		fprintf(stderr, "Fixed invalid offset in code\n");
-	else
+		was_protected = 1;
+	} else {
 		fprintf(stderr, "No invalid offsets\n");
+	}
+
+	if(was_protected)
+		fprintf(stderr, "Program was protected.\n");
+	else
+		fprintf(stderr, "Program was not protected.\n");
+
+	if(checkonly) {
+		fprintf(stderr, "Check-only mode; no output written.\n");
+		if(was_protected)
+			return 0;
+		else
+			return 2;
+	}
+
+	int got = fwrite(data, 1, filelen, output_file);
+	fclose(output_file);
+	fprintf(stderr, "wrote %d bytes\n", got);
 
-	fwrite(data, filelen, 1, output_file);
 	return 0;
 }