X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rln;a=blobdiff_plain;f=rln.c;h=a0b5ab02aa040e7e4c071822b100bba2956addba;hp=a117a86b27fc2e75fa0e4beb1ddf22230e4f57a3;hb=459661e27fa46d47b460ad13737a0dedd5d10fe2;hpb=822fb0b2350996a53d3a560dfd47110febc4f108

diff --git a/rln.c b/rln.c
index a117a86..a0b5ab0 100644
--- a/rln.c
+++ b/rln.c
@@ -2448,7 +2448,8 @@ int LoadArchive(char * fname, int fd)
 		}
 
 		// Check to see if a long filename was requested
-		if (objName[0] == 0x20)
+		// N.B.: " " is for GNU archives, and "/" is for BSD archives
+		if ((objName[0] == 0x20) || (objName[0] == '/'))
 		{
 			uint32_t fnSize = atoi(objName + 1);
 
@@ -2850,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
@@ -2908,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':
@@ -2976,6 +2984,22 @@ int doargs(int argc, char * argv[])
 
 				wflag = 1;
 				break;
+			case 'y':
+			case 'Y':
+				if (i >= argc)
+				{
+					printf("No directory filename following -y switch\n");
+					return 1;
+				}
+
+				if (strlen(argv[i]) > FARGSIZE * 3)
+				{
+					printf("Directory file name too long (sorry!)\n");
+					return 1;
+				}
+
+				strcpy(libdir, argv[i++]);
+				break;
 			case 'z':
 			case 'Z':					// Suppress banner flag
 				if (zflag)
@@ -3043,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");
@@ -3056,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");
@@ -3068,6 +3092,7 @@ void ShowHelp(void)
 	printf("   -u                      allow unresolved symbols (experimental)\n");
 	printf("   -v                      set verbose mode\n");
 	printf("   -w                      show linker warnings\n");
+	printf("   -y <fname>              set include path (also set by RLNPATH)\n");
 	printf("   -z                      suppress banner\n");
 	printf("\n");
 }
@@ -3114,6 +3139,21 @@ int main(int argc, char * argv[])
 		ExitLinker();
 	}
 
+	// Check to see if include paths actually exist
+	if (strlen(libdir) > 0)
+	{
+		DIR * test = opendir(libdir);
+
+		if (test == NULL)
+		{
+			printf("Invalid include path: %s\n", libdir);
+			errflag = 1;
+			ExitLinker();
+		}
+
+		closedir(test);
+	}
+
 	if (!zflag && !vflag)
 	{
 		ShowVersion();				// Display version information