Fixed a typo.

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index ecf4e76..56e6a23 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -22,8 +22,9 @@
  *
  */
 
-// To use it as a super-history-search:
-// ./selector -v -f ${HISTFILE}
+// To use it as a super-history-search for bash:
+//
+// alias h='./selector -i -b -v -f <(history)'
 
 // This software is highly Linux-specific, but I would be glad to get
 // patches to make it work on other OS
@@ -43,13 +44,16 @@ using namespace std;
 
 #define VERSION "1.0"
 
+const int buffer_size = 1024;
+
 // Yeah, global variables!
 
-int buffer_size = 1024;
 int nb_lines_max = 10000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 int with_colors = 1;
+int zsh_history = 0, bash_history = 0;
+int inverse_order = 0;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -57,7 +61,7 @@ int with_colors = 1;
 
 void inject_into_tty_buffer(char *line) {
   char *tty = ttyname(STDIN_FILENO);
-  int fd = open(tty, O_WRONLY);
+  int fd = open(tty, O_RDWR);
 
   struct termios oldtio, newtio;
 
@@ -335,20 +339,24 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
+  int color_fg_modeline, color_bg_modeline;
+  int color_fg_highlight, color_bg_highlight;
 
-  int color_fg_modeline = COLOR_WHITE;
-  int color_bg_modeline = COLOR_BLACK;
-  int color_fg_highlight = COLOR_BLACK;
-  int color_bg_highlight = COLOR_YELLOW;
+  color_fg_modeline  = COLOR_WHITE;
+  color_bg_modeline  = COLOR_BLACK;
+  color_fg_highlight = COLOR_BLACK;
+  color_bg_highlight = COLOR_YELLOW;
 
   setlocale(LC_ALL, "");
 
   char input_filename[buffer_size], output_filename[buffer_size];
+
   strcpy(input_filename, "");
-  strcpy(output_filename, "/tmp/selector.out");
+  strcpy(output_filename, "");
 
   int i = 1;
   while(i < argc) {
+
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
       strncpy(output_filename, argv[i+1], buffer_size);
@@ -377,8 +385,23 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
+    // else if(strcmp(argv[i], "-b") == 0) {
+    // no_blink = 1;
+    // i++;
+    // }
+
+    else if(strcmp(argv[i], "-i") == 0) {
+      inverse_order = 1;
+      i++;
+    }
+
+    else if(strcmp(argv[i], "-z") == 0) {
+      zsh_history = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-b") == 0) {
-      no_blink = 1;
+      bash_history = 1;
       i++;
     }
 
@@ -389,7 +412,7 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-c") == 0) {
-      check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+      check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
       color_fg_modeline = atoi(argv[i+1]);
       color_bg_modeline = atoi(argv[i+2]);
       color_fg_highlight = atoi(argv[i+3]);
@@ -404,10 +427,11 @@ int main(int argc, char **argv) {
            << endl
            << argv[0]
            << " [-h]"
-           << " [-b]"
            << " [-v]"
            << " [-m]"
-           << " [-c <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
+           << " [-z]"
+           << " [-i]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -426,6 +450,8 @@ int main(int argc, char **argv) {
     exit(1);
   }
 
+  int nb_lines = 0;
+
   ifstream file(input_filename);
 
   if(file.fail()) {
@@ -433,12 +459,31 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  int nb_lines = 0;
   while(nb_lines < nb_lines_max && !file.eof()) {
     file.getline(buffer, buffer_size);
-    lines[nb_lines] = new char[strlen(buffer) + 1];
-    strcpy(lines[nb_lines], buffer);
-    nb_lines++;
+    if(strcmp(buffer, "") != 0) {
+      char *s = buffer;
+      if(zsh_history && *s == ':') {
+        while(*s && *s != ';') s++;
+        if(*s == ';') s++;
+      }
+
+      if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
+        while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+      }
+
+      lines[nb_lines] = new char[strlen(s) + 1];
+      strcpy(lines[nb_lines], s);
+      nb_lines++;
+    }
+  }
+
+  if(inverse_order) {
+    for(int i = 0; i < nb_lines/2; i++) {
+      char *s = lines[nb_lines - 1 - i];
+      lines[nb_lines - 1 - i] = lines[i];
+      lines[i] = s;
+    }
   }
 
   char patterns[buffer_size];
@@ -533,7 +578,9 @@ int main(int argc, char **argv) {
       if(temporary_line >= 0 && temporary_line < nb_lines) {
         inject_into_tty_buffer(lines[temporary_line]);
       }
-    } else {
+    }
+
+    if(output_filename[0]) {
       ofstream out(output_filename);
       if(out.fail()) {
         cerr << "Can not open " << output_filename << " for writing." << endl;