Merge pull request #47 from hSaria/development

Development

src/defs.h

@@ -3,6 +3,7 @@
 #include "config.h"
 
 #include <ctype.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -37,7 +38,7 @@ typedef const char *PCRE_ERR_P;
   { compiled = pcre_compile(regex, 0, err_p, err_n, NULL); }
 #endif
 
-#define VERSION "0.2.3"
+#define VERSION "0.2.4"
 
 #define FALSE 0
 #define TRUE 1

src/main.c

@@ -35,11 +35,9 @@ int main(int argc, char **argv) {
     default:
       printf("ChromaTerm-- v%s\n", VERSION);
       printf("Usage: %s [-a] [-c file] [-d]\n", argv[0]);
-      printf("%6s %-18s Allow colliding actions\n", "-a", "");
-      printf("%6s %-18s Override configuration file\n", "-c", "{config file}");
-      printf("%6s %-18s Demonstrate the available color-codes for custom "
-             "actions\n",
-             "-d", "");
+      printf("%7s %-5s Allow colliding actions\n", "-a", "");
+      printf("%7s %-5s Override configuration file\n", "-c", "file");
+      printf("%7s %-5s Demo the available custom color-codes\n", "-d", "");
 
       quit_with_signal(2);
     }
@@ -55,6 +53,8 @@ int main(int argc, char **argv) {
     }
   }
 
+  signal(SIGINT, SIG_IGN); /* Ignore interrupt */
+
   /* fd_set used for checking if there's more input */
   FD_ZERO(&readfds); /* Initialize */
   FD_SET(STDIN_FILENO, &readfds);
@@ -162,9 +162,11 @@ void colordemo(void) {
 }
 
 void quit_with_signal(int exit_signal) {
+  int i;
+
   /* Free memory used by highlights */
-  while (gd.highlights[0]) {
-    unhighlight(gd.highlights[0]->condition);
+  for (i = gd.highlights_used - 1; i > -1; i--) {
+    unhighlight(gd.highlights[i]->condition);
   }
 
   free(gd.highlights);