X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=56e6a231d4ba4bc0dccf061ead08b79f6076c1ad;hb=9e81a172c9af260e5ff383039774c244b6369ed0;hp=f89f6b8f0c9991b4dd916377d0d3df12bde2652a;hpb=1aa2ab0e57b73a863712019a4c8153d08e088ce1;p=selector.git

diff --git a/selector.cc b/selector.cc
index f89f6b8..56e6a23 100644
--- 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,14 +44,15 @@ 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;
+int zsh_history = 0, bash_history = 0;
 int inverse_order = 0;
 
 //////////////////////////////////////////////////////////////////////
@@ -59,7 +61,7 @@ int inverse_order = 0;
 
 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;
 
@@ -340,19 +342,21 @@ int main(int argc, char **argv) {
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
-  color_fg_modeline = COLOR_WHITE;
-  color_bg_modeline = COLOR_BLACK;
+  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);
@@ -381,10 +385,10 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
-    else if(strcmp(argv[i], "-b") == 0) {
-      no_blink = 1;
-      i++;
-    }
+    // else if(strcmp(argv[i], "-b") == 0) {
+    // no_blink = 1;
+    // i++;
+    // }
 
     else if(strcmp(argv[i], "-i") == 0) {
       inverse_order = 1;
@@ -396,6 +400,11 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-b") == 0) {
+      bash_history = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
       nb_lines_max = atoi(argv[i+1]);
@@ -441,6 +450,8 @@ int main(int argc, char **argv) {
     exit(1);
   }
 
+  int nb_lines = 0;
+
   ifstream file(input_filename);
 
   if(file.fail()) {
@@ -448,7 +459,6 @@ 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);
     if(strcmp(buffer, "") != 0) {
@@ -457,6 +467,11 @@ int main(int argc, char **argv) {
         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++;
@@ -563,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;