#define VERSION "1.0"
-const int buffer_size = 4096;
+#define BUFFER_SIZE 4096
/* Yeah, global variables! */
void inject_into_tty_buffer(char *string) {
struct termios oldtio, newtio;
const char *k;
+ const char control_q = '\021';
tcgetattr(STDIN_FILENO, &oldtio);
memset(&newtio, 0, sizeof(newtio));
/* Set input mode (non-canonical, *no echo*,...) */
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
- const char control_q = '\021';
/* Put the selected string in the tty input buffer */
for(k = string; *k; k++) {
if(add_control_qs && !(*k >= ' ' && *k <= '~')) {
}
}
-/*********************************************************************
- A quick and dirty hash table
+/* A quick and dirty hash table */
+
+/* The table itself stores indexes of the strings taken in a char
+ **table. When a string is added, if it was already in the table,
+ **the new index replaces the previous one. */
+
+typedef struct {
+ int size;
+ int *entries;
+} hash_table_t;
+
+hash_table_t *new_hash_table(int size) {
+ int k;
+ hash_table_t *hash_table;
- The table itself stores indexes of the strings taken in a char
- **table. When a string is added, if it was already in the table, the
- new index replaces the previous one. */
+ hash_table = (hash_table_t *) malloc(sizeof(hash_table_t));
-int *new_hash_table(int hash_table_size) {
- int *result, k;
- result = (int *) malloc(hash_table_size * sizeof(int));
- for(k = 0; k < hash_table_size; k++) {
- result[k] = -1;
+ hash_table->size = size;
+ hash_table->entries = (int *) malloc(hash_table->size * sizeof(int));
+
+ for(k = 0; k < hash_table->size; k++) {
+ hash_table->entries[k] = -1;
}
- return result;
+
+ return hash_table;
+}
+
+void free_hash_table(hash_table_t *hash_table) {
+ free(hash_table->entries);
+ free(hash_table);
}
/* Adds new_string in the table, associated to new_index. If this
string was not already in the table, returns -1. Otherwise, returns
the previous index it had. */
-int test_and_add(char *new_string, int new_index,
- char **strings,
- int *hash_table, int hash_table_size) {
+int add_and_get_previous_index(hash_table_t *hash_table,
+ const char *new_string, int new_index,
+ char **strings) {
unsigned int code = 0;
int k;
/* This is my recipe. I checked, it seems to work (as long as
- hash_table_size is not a multiple of 387433 that should be
+ hash_table->size is not a multiple of 387433 that should be
okay) */
for(k = 0; new_string[k]; k++) {
code = code * 387433 + (unsigned int) (new_string[k]);
}
- code = code % hash_table_size;
+ code = code % hash_table->size;
- while(hash_table[code] >= 0) {
+ while(hash_table->entries[code] >= 0) {
/* There is a string with that code */
- if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ if(strcmp(new_string, strings[hash_table->entries[code]]) == 0) {
/* It is the same string, we keep a copy of the stored index */
- int result = hash_table[code];
+ int result = hash_table->entries[code];
/* Put the new one */
- hash_table[code] = new_index;
+ hash_table->entries[code] = new_index;
/* And return the previous one */
return result;
}
/* This collision was not the same string, let's move to the next
in the table */
- code = (code + 1) % hash_table_size;
+ code = (code + 1) % hash_table->size;
}
/* This string was not already in there, store the index in the
table and return -1 */
- hash_table[code] = new_index;
+ hash_table->entries[code] = new_index;
return -1;
}
void initialize_matcher(int use_regexp, int case_sensitive,
matcher_t *matcher, const char *pattern) {
const char *s;
- char *t;
+ char *t, *last_pattern_start;
+ int n;
if(use_regexp) {
matcher->nb_patterns = -1;
strcpy(matcher->splitted_patterns, pattern);
- int n = 0;
- char *last_pattern_start = matcher->splitted_patterns;
+ n = 0;
+ last_pattern_start = matcher->splitted_patterns;
for(t = matcher->splitted_patterns; n < matcher->nb_patterns; t++) {
if(*t == pattern_separator || *t == '\0') {
*t = '\0';
void delete_char(char *buffer, int *position) {
if(buffer[*position]) {
int c = *position;
- while(c < buffer_size && buffer[c]) {
+ while(c < BUFFER_SIZE && buffer[c]) {
buffer[c] = buffer[c+1];
c++;
}
}
void insert_char(char *buffer, int *position, char character) {
- if(strlen(buffer) < buffer_size - 1) {
+ if(strlen(buffer) < BUFFER_SIZE - 1) {
int c = *position;
char t = buffer[c], u;
while(t) {
int cursor_position,
char *pattern) {
- char buffer[buffer_size];
+ char buffer[BUFFER_SIZE];
matcher_t matcher;
int k, l, m;
+ int console_width, console_height;
+ int nb_printed_lines = 0;
+ int cursor_x;
initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
- int console_width = getmaxx(stdscr);
- int console_height = getmaxy(stdscr);
-
- /* First, we find a visible line. */
-
- int nb_printed_lines = 0;
+ console_width = getmaxx(stdscr);
+ console_height = getmaxy(stdscr);
use_default_colors();
addstr("\n");
+ /* First, we find a visible line. */
+
if(matcher.regexp_error) {
attron(attr_error);
addnstr("Regexp syntax error", console_width);
if(match(lines[l], &matcher)) {
int k = 0;
- while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) {
+ while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) {
buffer[k] = lines[l][k];
k++;
}
/* There must be a more elegant way of moving the cursor at a
location met during display */
- int cursor_x = 0;
+ cursor_x = 0;
if(title) {
addstr(title);
/*********************************************************************/
-void read_file(const char *input_filename,
- int nb_lines_max, int *nb_lines, char **lines,
- int hash_table_size, int *hash_table) {
+void store_line(hash_table_t *hash_table,
+ const char *t,
+ int nb_lines_max, int *nb_lines, char **lines) {
+ int dup;
+
+ /* Remove the zsh history prefix */
+
+ if(zsh_history && *t == ':') {
+ while(*t && *t != ';') t++;
+ if(*t == ';') t++;
+ }
+
+ /* Remove the bash history prefix */
+
+ if(bash_history) {
+ while(*t == ' ') t++;
+ while(*t >= '0' && *t <= '9') t++;
+ while(*t == ' ') t++;
+ }
- char raw_line[buffer_size];
+ /* Check for duplicates with the hash table and insert the line in
+ the list if necessary */
- FILE *file = fopen(input_filename, "r");
+ if(hash_table) {
+ dup = add_and_get_previous_index(hash_table, t, *nb_lines, lines);
+ } else {
+ dup = -1;
+ }
+
+ if(dup < 0) {
+ lines[*nb_lines] = (char *) malloc((strlen(t) + 1) * sizeof(char));
+ strcpy(lines[*nb_lines], t);
+ } 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 */
+ lines[*nb_lines] = lines[dup];
+ lines[dup] = 0;
+ }
+
+ (*nb_lines)++;
+}
+
+void read_file(hash_table_t *hash_table,
+ const char *input_filename,
+ int nb_lines_max, int *nb_lines, char **lines) {
+
+ char raw_line[BUFFER_SIZE];
+ int start, end, k;
+ FILE *file;
+
+ file = fopen(input_filename, "r");
if(!file) {
fprintf(stderr, "Can not open `%s'.\n", input_filename);
exit(1);
}
- int start = 0, end = 0, k;
+ start = 0;
+ end = 0;
while(*nb_lines < nb_lines_max && (end > start || !feof(file))) {
int eol = start;
end -= start;
eol -= start;
start = 0;
- end += fread(raw_line + end, sizeof(char), buffer_size - end, file);
+ end += fread(raw_line + end, sizeof(char), BUFFER_SIZE - end, file);
while(eol < end && raw_line[eol] != '\n') eol++;
}
- if(eol == buffer_size) {
- raw_line[buffer_size - 1] = '\0';
- fprintf(stderr, "Line too long:\n");
+ if(eol == BUFFER_SIZE) {
+ raw_line[BUFFER_SIZE - 1] = '\0';
+ fprintf(stderr, "Line too long (max is %d characters):\n", BUFFER_SIZE);
fprintf(stderr, raw_line);
fprintf(stderr, "\n");
exit(1);
raw_line[eol] = '\0';
- char *t = raw_line + start;
-
- /* Remove the zsh history prefix */
-
- if(zsh_history && *t == ':') {
- while(*t && *t != ';') t++;
- if(*t == ';') t++;
- }
-
- /* Remove the bash history prefix */
-
- if(bash_history) {
- while(*t == ' ') t++;
- while(*t >= '0' && *t <= '9') t++;
- while(*t == ' ') t++;
- }
-
- /* Check for duplicates with the hash table and insert the line in
- the list if necessary */
-
- int dup;
-
- if(hash_table) {
- dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
- } else {
- dup = -1;
- }
-
- if(dup < 0) {
- lines[*nb_lines] = (char *) malloc((strlen(t) + 1) * sizeof(char));
- strcpy(lines[*nb_lines], t);
- } 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 */
- lines[*nb_lines] = lines[dup];
- lines[dup] = 0;
- }
-
- (*nb_lines)++;
+ store_line(hash_table, raw_line + start,
+ nb_lines_max, nb_lines, lines);
start = eol + 1;
}
+
+ fclose(file);
}
/*********************************************************************/
int main(int argc, char **argv) {
- if(!ttyname(STDIN_FILENO)) {
- fprintf(stderr, "The standard input is not a tty.\n");
- exit(1);
- }
-
- char input_filename[buffer_size], output_filename[buffer_size];
+ char input_filename[BUFFER_SIZE], output_filename[BUFFER_SIZE];
+ char pattern[BUFFER_SIZE];
int i, k, l, n;
+ int cursor_position;
int error = 0, show_help = 0;
int rest_are_files = 0;
+ int key;
+ int current_focus_line, displayed_focus_line;
int color_fg_modeline, color_bg_modeline;
int color_fg_highlight, color_bg_highlight;
+ char **lines, **labels;
+ int nb_lines;
+ hash_table_t *hash_table;
+
+ if(!ttyname(STDIN_FILENO)) {
+ fprintf(stderr, "The standard input is not a tty.\n");
+ exit(1);
+ }
+
color_fg_modeline = COLOR_WHITE;
color_bg_modeline = COLOR_BLACK;
color_fg_highlight = COLOR_BLACK;
if(strcmp(argv[i], "-o") == 0) {
check_opt(argc, argv, i, 1, "<output filename>");
- strncpy(output_filename, argv[i+1], buffer_size);
+ strncpy(output_filename, argv[i+1], BUFFER_SIZE);
i += 2;
}
else if(strcmp(argv[i], "-f") == 0) {
check_opt(argc, argv, i, 1, "<input filename>");
- strncpy(input_filename, argv[i+1], buffer_size);
+ strncpy(input_filename, argv[i+1], BUFFER_SIZE);
i += 2;
}
exit(error);
}
- char **lines = (char **) malloc(nb_lines_max * sizeof(char *));
+ lines = (char **) malloc(nb_lines_max * sizeof(char *));
- int nb_lines = 0;
- int hash_table_size = nb_lines_max * 10;
- int *hash_table = 0;
+ nb_lines = 0;
if(remove_duplicates) {
- hash_table = new_hash_table(hash_table_size);
+ hash_table = new_hash_table(nb_lines_max * 10);
+ } else {
+ hash_table = 0;
}
if(input_filename[0]) {
- read_file(input_filename,
- nb_lines_max, &nb_lines, lines,
- hash_table_size, hash_table);
+ read_file(hash_table,
+ input_filename,
+ nb_lines_max, &nb_lines, lines);
}
while(i < argc) {
- read_file(argv[i],
- nb_lines_max, &nb_lines, lines,
- hash_table_size, hash_table);
+ read_file(hash_table,
+ argv[i],
+ nb_lines_max, &nb_lines, lines);
i++;
}
- free(hash_table);
+ if(hash_table) {
+ free_hash_table(hash_table);
+ }
/* Now remove the null strings */
label_separator and transform control characters to printable
ones */
- char **labels = (char **) malloc(nb_lines * sizeof(char *));
+ labels = (char **) malloc(nb_lines * sizeof(char *));
+
for(l = 0; l < nb_lines; l++) {
char *s, *t;
+ int e = 0;
const char *u;
t = lines[l];
- int e = 0;
while(*t && *t != label_separator) {
u = unctrl(*t++);
e += strlen(u);
*s = '\0';
}
- char pattern[buffer_size];
pattern[0] = '\0';
- int cursor_position;
cursor_position = 0;
/* Here we start to display with curse */
}
- int key;
- int current_focus_line = 0, displayed_focus_line = 0;
+ current_focus_line = 0;
+ displayed_focus_line = 0;
update_screen(¤t_focus_line, &displayed_focus_line,
0,
nb_lines, labels, cursor_position, pattern);
do {
+ int motion = 0;
key = getch();
- int motion = 0;
-
if(key >= ' ' && key <= '~') { /* Insert character */
insert_char(pattern, &cursor_position, key);
}
projects / selector.git / blobdiff