projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated the copyright headers and the version to 1.1.6.
[selector.git]
/
selector.c
diff --git
a/selector.c
b/selector.c
index
ff75c7a
..
0cb82ea
100644
(file)
--- a/
selector.c
+++ b/
selector.c
@@
-3,7
+3,7
@@
* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
- * Copyright (c) 2009, 2010, 2011 Francois Fleuret
+ * Copyright (c) 2009, 2010, 2011
, 2012
Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
@@
-45,7
+45,7
@@
#include <getopt.h>
#include <limits.h>
#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.
5
"
+#define VERSION "1.1.
6
"
#define BUFFER_SIZE 4096
#define BUFFER_SIZE 4096
@@
-320,12
+320,15
@@
struct matcher {
};
/* Routine to add an interval to a sorted list of intervals
};
/* Routine to add an interval to a sorted list of intervals
- extermities. Returns the number of extremities. This is an effing
- nightmare */
+ extremities. Returns the resulting number of extremities.
+
+ This routine is an effing nightmare */
int add_interval(int n, int *switches, int start, int end) {
int f, g, k;
int add_interval(int n, int *switches, int start, int end) {
int f, g, k;
+ if(start == end) { return n; }
+
f = 0;
while(f < n && switches[f] <= start) { f++; }
g = f;
f = 0;
while(f < n && switches[f] <= start) { f++; }
g = f;
@@
-339,24
+342,18
@@
int add_interval(int n, int *switches, int start, int end) {
return n + 2;
}
return n + 2;
}
- if(f
%
2) {
+ if(f
%
2) {
- if(f == g) {
- /* switches[f-1] start end switches[f] */
- /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
- return n;
- }
-
- if(g%2) {
+ if(g % 2) {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
- for(k = f; k < n; k++) { switches[k] = switches[
(k - f) + g
]; }
+ for(k = f; k < n; k++) { switches[k] = switches[
k + (g - f)
]; }
return n - (g - f);
} else {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */
switches[g - 1] = end;
return n - (g - f);
} else {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */
switches[g - 1] = end;
- for(k = f; k < n; k++) { switches[k] = switches[
(k - f) + (g - 1
)]; }
+ for(k = f; k < n; k++) { switches[k] = switches[
k + ((g - 1) - f
)]; }
return n - ((g - 1) - f);
}
return n - ((g - 1) - f);
}
@@
-365,7
+362,7
@@
int add_interval(int n, int *switches, int start, int end) {
if(f == g) {
/* switches[f-1] start end switches[f] */
/* XXXXXXXXXXXX| |XXXXXXXXXX */
if(f == g) {
/* switches[f-1] start end switches[f] */
/* XXXXXXXXXXXX| |XXXXXXXXXX */
- for(k = n; k >= f; k--) {
+ for(k = n
- 1
; k >= f; k--) {
switches[k + 2] = switches[k];
}
switches[f] = start;
switches[k + 2] = switches[k];
}
switches[f] = start;
@@
-373,18
+370,18
@@
int add_interval(int n, int *switches, int start, int end) {
return n + 2;
}
return n + 2;
}
- if(g
%
2) {
+ if(g
%
2) {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
switches[f] = start;
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
switches[f] = start;
- for(k = f + 1; k < n; k++) { switches[k] = switches[
(k - (f + 1)) + g
]; }
+ for(k = f + 1; k < n; k++) { switches[k] = switches[
k + (g - (f + 1))
]; }
return n - (g - (f + 1));
} else {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */
switches[f] = start;
switches[g - 1] = end;
return n - (g - (f + 1));
} else {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */
switches[f] = start;
switches[g - 1] = end;
- for(k = f + 1; k < n; k++) { switches[k] = switches[
(k - (f + 1)) + (g - 1
)]; }
+ for(k = f + 1; k < n; k++) { switches[k] = switches[
k + ((g - 1) - (f + 1)
)]; }
return n - ((g - 1) - (f + 1));
}
}
return n - ((g - 1) - (f + 1));
}
}
@@
-393,6
+390,7
@@
int add_interval(int n, int *switches, int start, int end) {
int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) {
int n;
char *where;
int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) {
int n;
char *where;
+ regmatch_t matches;
if(nb_switches) { *nb_switches = 0; }
if(nb_switches) { *nb_switches = 0; }
@@
-418,7
+416,18
@@
int match(struct matcher *matcher, char *string, int *nb_switches, int *switches
}
return 1;
} else {
}
return 1;
} else {
- return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ if(switches) {
+ if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
+ *nb_switches = 2;
+ switches[0] = matches.rm_so;
+ switches[1] = matches.rm_eo;
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ }
}
}
}
}
@@
-570,12
+579,12
@@
void print_string_with_switches(char *buffer, int line_width,
if(switches[2 * w] < switches[2 * w + 1]) {
next = switches[2 * w];
if(next > line_width) { next = line_width; }
if(switches[2 * w] < switches[2 * w + 1]) {
next = switches[2 * w];
if(next > line_width) { next = line_width; }
- addnstr(buffer + current, next - current);
+ if(next > current) { addnstr(buffer + current, next - current); }
attron(attr_hits);
current = next;
next = switches[2 * w + 1];
if(next > line_width) { next = line_width; }
attron(attr_hits);
current = next;
next = switches[2 * w + 1];
if(next > line_width) { next = line_width; }
- addnstr(buffer + current, next - current);
+ if(next > current) { addnstr(buffer + current, next - current); }
attroff(attr_hits);
current = next;
}
attroff(attr_hits);
current = next;
}
@@
-616,8
+625,12
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
- if(show_hits && matcher.nb_patterns > 0) {
- switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ if(show_hits) {
+ if(matcher.nb_patterns >= 0) {
+ switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ } else {
+ switches = safe_malloc(sizeof(int) * 2);
+ }
} else {
switches = 0;
}
} else {
switches = 0;
}
@@
-741,7
+754,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
}
attron(attr_focus_line);
print_string_with_switches(buffer, k, console_width,
}
attron(attr_focus_line);
print_string_with_switches(buffer, k, console_width,
- nb_switches, switches);
+ nb_switches
/ 2
, switches);
attroff(attr_focus_line);
} else {
if(show_long_lines && k >= console_width) {
attroff(attr_focus_line);
} else {
if(show_long_lines && k >= console_width) {
@@
-755,8
+768,9
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
buffer[k++] = '\n';
buffer[k++] = '\0';
}
buffer[k++] = '\n';
buffer[k++] = '\0';
}
+
print_string_with_switches(buffer, k, console_width,
print_string_with_switches(buffer, k, console_width,
- nb_switches, switches);
+ nb_switches
/ 2
, switches);
}
nb_printed_lines++;
}
nb_printed_lines++;
@@
-949,6
+963,7
@@
static struct option long_options[] = {
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
{ "show-long-lines", no_argument, 0, 'j'},
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
{ "show-long-lines", no_argument, 0, 'j'},
+ { "show-hits", no_argument, 0, 'j'},
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
{ "number-of-lines", 1, 0, 'l' },
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
{ "number-of-lines", 1, 0, 'l' },