projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the code for the -a option, which was missing (?!).
[selector.git]
/
selector.cc
diff --git
a/selector.cc
b/selector.cc
index
6360698
..
bd50899
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-138,6
+138,7
@@
int *new_hash_table(int hash_table_size) {
int test_and_add(char *new_string, int new_index,
char **strings, int *hash_table, int hash_table_size) {
int test_and_add(char *new_string, int new_index,
char **strings, int *hash_table, int hash_table_size) {
+
unsigned int code = 0;
// This is my recipe. I checked, it seems to work (as long as
unsigned int code = 0;
// This is my recipe. I checked, it seems to work (as long as
@@
-200,11
+201,11
@@
int match(char *string, matcher_t *matcher) {
}
void free_matcher(matcher_t *matcher) {
}
void free_matcher(matcher_t *matcher) {
- if(matcher->nb_patterns >= 0) {
+ if(matcher->nb_patterns < 0) {
+ if(!matcher->regexp_error) regfree(&matcher->preg);
+ } else {
delete[] matcher->splitted_patterns;
delete[] matcher->patterns;
delete[] matcher->splitted_patterns;
delete[] matcher->patterns;
- } else {
- if(!matcher->regexp_error) regfree(&matcher->preg);
}
}
}
}
@@
-388,7
+389,7
@@
void update_screen(int *current_line, int *temporary_line, int motion,
int first_line = new_line, last_line = new_line, nb_match = 1;
// We find the first and last line to show, so that the total of
int first_line = new_line, last_line = new_line, nb_match = 1;
// We find the first and last line to show, so that the total of
- // visible lines between them (them include
) is console_height -
1
+ // visible lines between them (them include
d) is console_height-
1
while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) {
while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) {
@@
-425,8
+426,8
@@
void update_screen(int *current_line, int *temporary_line, int motion,
k++;
}
k++;
}
- // We fill the rest of the line with blanks if
either we did
- //
not clear() or if this is the
highlighted line
+ // We fill the rest of the line with blanks if
this is the
+ // highlighted line
if(l == new_line) {
while(k < console_width) {
if(l == new_line) {
while(k < console_width) {
@@
-570,36
+571,48
@@
void read_file(const char *input_filename,
char *s, *t;
const char *u;
char *s, *t;
const char *u;
- s = buffer;
t = raw_line;
t = raw_line;
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
+
+ // Remove the zsh history prefix
+
+ if(zsh_history && *t == ':') {
+ while(*t && *t != ';') s++;
+ if(*t == ';') t++;
}
}
- *s = '\0';
- s = buffer;
+ // Remove the bash history prefix
- if(zsh_history && *s == ':') {
- while(*s && *s != ';') s++;
- if(*s == ';') s++;
+ if(bash_history) {
+ while(*t == ' ') t++;
+ while(*t >= '0' && *t <= '9') t++;
+ while(*t == ' ') t++;
}
}
- if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
- while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+ // Copy the string while transforming the ctrl characters into
+ // printable characters
+
+ s = buffer;
+
+ while(*t) {
+ u = unctrl(*t++);
+ while(*u) { *s++ = *u++; }
}
}
+ *s = '\0';
+
+ // Check for duplicates with the hash table and insert the line
+ // in the list if necessary
int dup;
if(hash_table) {
int dup;
if(hash_table) {
- dup = test_and_add(
s
, *nb_lines, lines, hash_table, hash_table_size);
+ dup = test_and_add(
buffer
, *nb_lines, lines, hash_table, hash_table_size);
} else {
dup = -1;
}
if(dup < 0) {
} else {
dup = -1;
}
if(dup < 0) {
- lines[*nb_lines] = new char[strlen(
s
) + 1];
- strcpy(lines[*nb_lines],
s
);
+ lines[*nb_lines] = new char[strlen(
buffer
) + 1];
+ strcpy(lines[*nb_lines],
buffer
);
} else {
// The string was already in there, so we do not allocate a
// new string but use the pointer to the first occurence of it
} else {
// The string was already in there, so we do not allocate a
// new string but use the pointer to the first occurence of it
@@
-701,6
+714,8
@@
int main(int argc, char **argv) {
}
else if(strcmp(argv[i], "-a") == 0) {
}
else if(strcmp(argv[i], "-a") == 0) {
+ case_sensitive = 1;
+ i++;
}
else if(strcmp(argv[i], "-t") == 0) {
}
else if(strcmp(argv[i], "-t") == 0) {
@@
-950,7
+965,10
@@
int main(int argc, char **argv) {
update_screen(¤t_line, &temporary_line, motion,
nb_lines, lines, cursor_position, pattern);
update_screen(¤t_line, &temporary_line, motion,
nb_lines, lines, cursor_position, pattern);
- } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
+ } while(key != '\007' && // ^G
+ key != '\033' && // ^[ (escape)
+ key != '\n' &&
+ key != KEY_ENTER);
echo();
endwin();
echo();
endwin();