From: Francois Fleuret <francois@fleuret.org>
Date: Wed, 1 Apr 2009 07:09:15 +0000 (+0200)
Subject: Added an option -a for case sensitivity.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=af3bbcdf9a629c4fb333709dedd435b72bdc5213;p=selector.git

Added an option -a for case sensitivity.
---

diff --git a/selector.1 b/selector.1
index 0af244d..714a3de 100644
--- a/selector.1
+++ b/selector.1
@@ -46,6 +46,8 @@ remove the time prefix from zsh history
 remove duplicated lines
 .IP "\fB-e\fP" 10
 start with the regexp mode activated
+.IP "\fB-e\fP" 10
+make the matching case sensitive
 .IP "\fB-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\fP" 10
 select the modeline and highlight color numbers
 .IP "\fB-v\fP" 10
diff --git a/selector.cc b/selector.cc
index 3ffccc1..0bb2d3f 100644
--- a/selector.cc
+++ b/selector.cc
@@ -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
 
@@ -463,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]);
@@ -504,6 +518,7 @@ int main(int argc, char **argv) {
          << " -z      remove the zsh history line prefix" << 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