X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=0bb2d3f95ced54cd5fde0dddc68172f7b0204872;hb=af3bbcdf9a629c4fb333709dedd435b72bdc5213;hp=42c36a3e9350235e26fcaf52db6b714083d08091;hpb=0fde38cd434c19ecb1083f03b2806d52f53cec9c;p=selector.git

diff --git a/selector.cc b/selector.cc
index 42c36a3..0bb2d3f 100644
--- a/selector.cc
+++ b/selector.cc
@@ -41,7 +41,7 @@ using namespace std;
 
 #define VERSION "1.0"
 
-const int buffer_size = 1024;
+const int buffer_size = 4096;
 
 // Yeah, global variables!
 
@@ -53,6 +53,7 @@ int zsh_history = 0, bash_history = 0;
 int inverse_order = 0;
 int remove_duplicates = 0;
 int use_regexp = 0;
+int case_sensitive = 0;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -129,13 +130,20 @@ struct matcher_t {
   regex_t preg;
   int regexp_error;
   int nb_patterns;
+  int case_sensitive;
   char *splitted_patterns, **patterns;
 };
 
 int match(char *string, matcher_t *matcher) {
   if(matcher->nb_patterns >= 0) {
-    for(int n = 0; n < matcher->nb_patterns; n++) {
-      if(strstr(string, matcher->patterns[n]) == 0) return 0;
+    if(matcher->case_sensitive) {
+      for(int n = 0; n < matcher->nb_patterns; n++) {
+        if(strstr(string, matcher->patterns[n]) == 0) return 0;
+      }
+    } else {
+      for(int n = 0; n < matcher->nb_patterns; n++) {
+        if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+      }
     }
     return 1;
   } else {
@@ -152,13 +160,14 @@ void free_matcher(matcher_t *matcher) {
   }
 }
 
-void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern) {
+void initialize_matcher(int use_regexp, int case_sensitive, matcher_t *matcher, const char *pattern) {
   if(use_regexp) {
     matcher->nb_patterns = -1;
-    matcher->regexp_error = regcomp(&matcher->preg, pattern, REG_ICASE);
+    matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
   } else {
     matcher->regexp_error = 0;
     matcher->nb_patterns = 1;
+    matcher->case_sensitive = case_sensitive;
 
     for(const char *s = pattern; *s; s++) {
       if(*s == pattern_separator) {
@@ -210,7 +219,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   char buffer[buffer_size];
   matcher_t matcher;
 
-  initialize_matcher(use_regexp, &matcher, pattern);
+  initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
 
   // We now take care of printing the lines per se
 
@@ -228,8 +237,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   if(matcher.regexp_error) {
     addstr("[regexp error]");
-  } else {
-
+  } else if(nb_lines > 0) {
     int new_line;
     if(match(lines[*current_line], &matcher)) {
       new_line = *current_line;
@@ -349,6 +357,8 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     if(nb_printed_lines == 0) {
       addnstr("[no selection]\n", console_width);
     }
+  } else {
+    addnstr("[empty choice]\n", console_width);
   }
 
   // Draw the modeline
@@ -462,6 +472,11 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-a") == 0) {
+      case_sensitive = 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]);
@@ -497,13 +512,14 @@ int main(int argc, char **argv) {
          << "Usage: " << argv[0] << " [options] -f <file>" << endl
          << endl
          << " -h      show this help" << endl
-         << " -v      inject the selection in the tty" << endl
-         << " -m      monochrome mode" << endl
+         << " -v      inject the selected line in the tty" << endl
          << " -d      remove duplicated lines" << endl
-         << " -e      regexp mode when starting" << endl
          << " -b      remove the bash history line prefix" << endl
          << " -z      remove the zsh history line prefix" << endl
-         << " -i      invert the line order" << endl
+         << " -i      invert the order of lines" << endl
+         << " -e      start in regexp mode" << endl
+         << " -a      case sensitive" << endl
+         << " -m      monochrome mode" << endl
          << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
          << "         set the display colors" << endl
          << " -o <output filename>" << endl
@@ -544,7 +560,13 @@ int main(int argc, char **argv) {
 
     file.getline(raw_line, buffer_size);
 
-    if(strcmp(raw_line, "") != 0) {
+    if(raw_line[0]) {
+
+      if(file.fail()) {
+        cerr << "Line too long:" << endl;
+        cerr << raw_line << endl;
+        exit(1);
+      }
 
       char *s, *t;
       const char *u;