Fix problem in tokenizer that caused legit code to make assembler barf.

[rmac] / rmac.c

diff --git a/rmac.c b/rmac.c
index e5474da4f2d8370ec1056168d0a9a1bd25af3654..dd7add11a8f5503a8598497e784bec3951739ac3 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -712,6 +712,7 @@ int process(int argc, char **argv) {
    return(errcnt);
 }
 
+#if 0
 //
 // --- Interactive Mode ----------------------------------------------------------------------------
 //
@@ -725,11 +726,11 @@ void interactive(void)
 
    // As there is no command line, print a copyright message and prompt for command line
        s = "*****************************************************\n";
-       printf("\n%s* RMAC - Reboot's Macro Assembler for Atari Jaguar *\n", s);
+       printf("\n%s* RMAC - Reboot's Macro Assembler for Atari Jaguar  *\n", s);
        printf("* Copyright (C) 199x Landon Dyer, 2011 Reboot       *\n");
-       printf("* Version %01i.%01i.%01i                Platform: %-9s *\n",MAJOR,MINOR,PATCH,PLATFORM);
+       printf("* Version %01i.%01i.%01i                Platform: %-9s  *\n",MAJOR,MINOR,PATCH,PLATFORM);
        printf("* ------------------------------------------------- *\n");
-       printf("* INTERACTIVE MODE                                  *\n%s\n", s);
+       printf("* INTERACTIVE MODE (press ENTER by itself to quit)  *\n%s\n", s);
 
        perm_verb_flag = 1;                                      // Enter permanent verbose mode
 
@@ -740,7 +741,8 @@ void interactive(void)
                printf("* ");
                fflush(stdout);                                       // Make prompt visible
 
-               if (gets(ln) == NULL || !*ln)                          // Get input line
+//             if (gets(ln) == NULL || !*ln)                          // Get input line
+               if (fgets(ln, LNSIZ, stdin) == NULL || !*ln)                          // Get input line
                        break;
 
                argcnt = 0;                                           // Process input line
@@ -779,6 +781,7 @@ void interactive(void)
                        printf("%d assembly error%s\n", errcnt, (errcnt > 1) ? "s" : "");
        }
 }
+#endif
 
 //
 // --- Determine Processor Endianess ---------------------------------------------------------------
@@ -816,10 +819,15 @@ int main(int argc, char ** argv)
        {                                           // Full command line passed
                status = process(argc - 1, argv + 1);              
        }
+       // Interactive mode 
        else
-       {                                                 // Interactive mode 
-               status = 0;
-               interactive();
+       {
+// Sorry Landon, this is the year 20xx and we haz plenty of resources now ;-)
+//             status = 0;
+//             interactive();
+               // Instead, we show a nice banner and switches :-)
+               display_version();
+               display_help();
        }
 
        return status;