From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 28 Feb 2020 23:57:27 +0000 (-0600)
Subject: Fix for bug #132 (warnings for non-exclusive options).
X-Git-Tag: v1.7.1~5
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rln;a=commitdiff_plain;h=459661e27fa46d47b460ad13737a0dedd5d10fe2;hp=e0c5bd18176b70031fd7fce877c6ca1d8b093a8c

Fix for bug #132 (warnings for non-exclusive options).

Thanks to LinkoVitch for the report; now at v1.6.4.
---

diff --git a/rln.c b/rln.c
index 37e5197..a0b5ab0 100644
--- a/rln.c
+++ b/rln.c
@@ -2851,6 +2851,10 @@ int doargs(int argc, char * argv[])
 			case 'e':
 			case 'E':					// Output COFF (absolute only)
 				cflag = 1;
+
+				if (noheaderflag)
+					printf("Warning: -e overridden by -n, output will be headerless\n");
+
 				break;
 			case 'g':
 			case 'G':					// Output source level debugging
@@ -2909,6 +2913,9 @@ int doargs(int argc, char * argv[])
 				if (noheaderflag)
 					warn('n', 1);
 
+				if (cflag)
+					printf("Warning: -e overridden by -n, output will be headerless\n");
+
 				noheaderflag = 1;
 				break;
 			case 'o':
@@ -3060,7 +3067,7 @@ void ShowHelp(void)
 	printf("\n");
 	printf("Options:\n");
 	printf("   -? or -h                display usage information\n");
-	printf("   -a <text> <data> <bss>  output absolute file\n");
+	printf("   -a <text> <data> <bss>  output absolute file (default: ABS)\n");
 	printf("                           hex value: segment address\n");
 	printf("                           r: relocatable segment\n");
 	printf("                           x: contiguous segment\n");
@@ -3073,7 +3080,7 @@ void ShowHelp(void)
 	printf("   -ii <fname> <label>     incbin <fname> and set <label> (no truncation)\n");
 	printf("   -l                      add local symbols\n");
 	printf("   -m                      produce load symbols map\n");
-	printf("   -n                      output no file header to absolute file\n");
+	printf("   -n                      output no file header to absolute file (overrides -e)\n");
 	printf("   -o <fname>              set output name\n");
 	printf("   -r<size>                section alignment size\n");
 	printf("                           w: word (2 bytes)\n");
diff --git a/rln.h b/rln.h
index 6e2b092..75d6bb3 100644
--- a/rln.h
+++ b/rln.h
@@ -44,7 +44,7 @@
 
 #define MAJOR   1			// Major version number
 #define MINOR   6			// Minor version number
-#define PATCH   3			// Patch release number
+#define PATCH   4			// Patch release number
 
 #ifdef WIN32
 #define PLATFORM     "Win32"		// Release platform - Windows