X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=rmac.c;h=2f12bca48293dc6d946e35f274ec78704adb79b9;hb=cbc8347d4ffea164ca05b03e4e3be39945be8777;hp=c3da33dc734364f7516a3f819f8ea46a6f883a21;hpb=9ecc6f5e49e1740adee78dd45e1115c7e4fcc314;p=rmac

diff --git a/rmac.c b/rmac.c
index c3da33d..2f12bca 100644
--- a/rmac.c
+++ b/rmac.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
 // RMAC.C - Main Application Code
-// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -50,7 +50,8 @@ int endian;						// Host processor endianess (0 = LE, 1 = BE)
 char * objfname;				// Object filename pointer
 char * firstfname;				// First source filename
 char * cmdlnexec;				// Executable name, pointer to ARGV[0]
-char searchpath[512] = { 0 };	// Search path for include files
+char searchpatha[512] = { 0 };	// Buffer to hold searchpath when specified
+char * searchpath = NULL;		// Search path for include files
 char defname[] = "noname.o";	// Default output filename
 int optim_flags[OPT_COUNT];		// Specific optimisations on/off matrix
 int activecpu = CPU_68000;		// Active 68k CPU (68000 by default)
@@ -206,8 +207,8 @@ void DisplayVersion(void)
 		"| '__| '_ ` _ \\ / _` |/ __|\n"
 		"| |  | | | | | | (_| | (__ \n"
 		"|_|  |_| |_| |_|\\__,_|\\___|\n"
-		"\nReboot's Macro Assembler\n"
-		"Copyright (C) 199x Landon Dyer, 2011-2020 Reboot\n"
+		"\nRenamed Macro Assembler\n"
+		"Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends\n"
 		"V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
 }
 
@@ -410,16 +411,18 @@ int Process(int argc, char ** argv)
 			case 'i':				// Set directory search path
 			case 'I':
 			{
-				strcat(searchpath, argv[argno] + 2);
-                strcat(searchpath, ";");
+				strcat(searchpatha, argv[argno] + 2);
+				strcat(searchpatha, ";");
+				searchpath = searchpatha;
 
 				// Check to see if include paths actually exist
 				char current_path[256];
-				for (i = current_path_index; nthpath("RMACPATH", i, current_path) != 0; i++)
+
+				for(i=current_path_index; nthpath("RMACPATH", i, current_path)!=0; i++)
 				{
 					if (strlen(current_path) > 0)
 					{
-						DIR* test = opendir(current_path);
+						DIR * test = opendir(current_path);
 
 						if (test == NULL)
 						{
@@ -431,7 +434,8 @@ int Process(int argc, char ** argv)
 						closedir(test);
 					}
 				}
-				current_path_index = i-1;
+
+				current_path_index = i - 1;
 				break;
 			}
 			case 'l':				// Produce listing file