fix segfault on error bug #3

PaperFanz · Oct 15, 2019 · f304cef · f304cef
1 parent de33e19
commit f304cef
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 *.o
 laser
 laser-*
+*.exe
+*.ifp
+*.zip
 
 # ignore test files
 *.txt

diff --git a/src/Makefile b/src/Makefile
@@ -3,7 +3,7 @@ SHELL = /bin/sh
 IDIR = ../include
 ODIR = obj
 
-CC = clang
+CC = gcc
 CFLAGS = -I $(IDIR)
 
 _DEPS = laser.h token.h

diff --git a/src/flag.c b/src/flag.c
@@ -45,7 +45,7 @@ const char *about = "Laser- a command line utility to assemble LC3 assembly code
                     "\tYou should have received a copy of the GNU General Public License\n"
                     "\talong with Laser.  If not, see <https://www.gnu.org/licenses/>.\n";
 
-const char *version_num = "2.0.0";
+const char *version_num = "2.0.1";
 
 const char *usage = "Laser- a command line utility to assemble LC3 assembly code\n\n"
                     "Usage:\n"

diff --git a/src/notify.c b/src/notify.c
@@ -63,17 +63,13 @@ void endlog (void)
 void setcurrentfile (char *file)
 {
     // strip directories from filename string
-    char *ret = NULL;
-    #ifdef _WIN32
+    char *ret;
+#if defined(_WIN32) || defined(_WIN64)
     ret = strrchr (file, '\\') + 1;
-    #endif
-    #ifdef _WIN64
-    ret = strrchr (file, '\\') + 1;
-    #endif
-    #ifdef linux
+#else
     ret = strrchr (file, '/') + 1;
-    #endif
-    if (ret) file = ret;
+#endif
+    if (ret > file) file = ret;
     CURRENT_FILE = file;
 }
 
@@ -123,7 +119,11 @@ void warning (uint32_t ln, const char *format, ...)
 
     if (!NO_WARNINGS) {
         va_start (strs, format);
+#if defined(_WIN32) || defined(_WIN64)
+        printf ("Warning (%s line %d): ", CURRENT_FILE, ln);
+#else       
         printf ("\033[01;33mWarning (%s line %d):\033[0m ", CURRENT_FILE, ln);
+#endif
         vprintf (format, strs);
         printf("\n");
         va_end (strs);
@@ -147,7 +147,11 @@ void error (uint32_t ln, const char *format, ...)
 
     if (!NO_ERRORS) {
         va_start (strs, format);
+#ifdef _WIN32
+        printf ("Error (%s line %d): ", CURRENT_FILE, ln);
+#else
         printf ("\033[1;31mError (%s line %d):\033[0m ", CURRENT_FILE, ln);
+#endif
         vprintf (format, strs);
         printf("\n");
         va_end (strs);
@@ -160,4 +164,4 @@ void error (uint32_t ln, const char *format, ...)
         fprintf(CURRENT_LOG, "\n");
         va_end (strscpy);
     }
-}
+}