//
-// 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
//
char * objfname; // Object filename pointer
char * firstfname; // First source filename
char * cmdlnexec; // Executable name, pointer to ARGV[0]
+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
"| '__| '_ ` _ \\ / _` |/ __|\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);
}
int fd; // File descriptor
char fnbuf[FNSIZ]; // Filename buffer
int i; // Iterator
+ int current_path_index = 0; // Iterator for search paths
errcnt = 0; // Initialize error count
listing = 0; // Initialize listing level
glob_flag = 0; // Initialize .globl flag
optim_warn_flag = 0; // Initialize short branch flag
debug = 0; // Initialize debug flag
- searchpath = NULL; // Initialize search path
objfname = NULL; // Initialize object filename
list_fname = NULL; // Initialize listing filename
err_fname = NULL; // Initialize error filename
case 'i': // Set directory search path
case 'I':
{
- searchpath = argv[argno] + 2;
+ strcat(searchpatha, argv[argno] + 2);
+ strcat(searchpatha, ";");
+ searchpath = searchpatha;
// Check to see if include paths actually exist
- if (strlen(searchpath) > 0)
- {
- DIR * test = opendir(searchpath);
+ char current_path[256];
- if (test == NULL)
+ for(i=current_path_index; nthpath("RMACPATH", i, current_path)!=0; i++)
+ {
+ if (strlen(current_path) > 0)
{
- printf("Invalid include path: %s\n", searchpath);
- errcnt++;
- return errcnt;
- }
+ DIR * test = opendir(current_path);
+
+ if (test == NULL)
+ {
+ printf("Invalid include path: %s\n", current_path);
+ errcnt++;
+ return errcnt;
+ }
- closedir(test);
+ closedir(test);
+ }
}
+ current_path_index = i - 1;
break;
}
case 'l': // Produce listing file