projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added 'set -e' so that the script fails if any command fails.
[selector.git]
/
selector.cc
diff --git
a/selector.cc
b/selector.cc
index
637ae74
..
8c17dc1
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
@@
-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
@@
-950,7
+963,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();