Version bump for last commit; now at v2.0.23.

[rmac] / rmac.c

diff --git a/rmac.c b/rmac.c
index c3da33dc734364f7516a3f819f8ea46a6f883a21..4772d203bd93d612f5e9e6a7121ae37e98fc9786 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -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)
@@ -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