/*
To use it as a super-history-search for bash:
- selector --bash -l ${HISTSIZE} <(history)
+ selector --bash <(history)
*/
#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
#define BUFFER_SIZE 4096
fprintf(out, " -q, --no-beep\n");
fprintf(out, " make a flash instead of a beep on an edition error\n");
fprintf(out, " --bash\n");
- fprintf(out, " setting for bash history search, same as -b -i -d -v -w\n");
+ fprintf(out, " setting for bash history search, same as -b -i -d -v -w -l ${HISTSIZE}\n");
fprintf(out, " --, --rest-are-files\n");
fprintf(out, " all following arguments are filenames\n");
fprintf(out, " -t <title>, --title <title>\n");
const char *new_string, int new_index,
char **strings) {
- unsigned int code = 0;
+ unsigned int code = 0, start;
int k;
/* This is my recipe. I checked, it seems to work (as long as
}
code = code % hash_table->size;
+ start = code;
while(hash_table->entries[code] >= 0) {
/* There is a string with that code */
/* This collision was not the same string, let's move to the next
in the table */
code = (code + 1) % hash_table->size;
+ /* We came back to our original code, which means that the table
+ is full */
+ if(code == start) {
+ printf("Full hash table (that should not happen)\n");
+ exit(EXIT_FAILURE);
+ }
}
/* This string was not already in there, store the index in the
char **lines, **labels;
int nb_lines;
struct hash_table_t *hash_table;
+ char *bash_histsize;
if(!isatty(STDIN_FILENO)) {
fprintf(stderr, "selector: The standard input is not a tty.\n");
remove_duplicates = 1;
output_to_vt_buffer = 1;
add_control_qs = 1;
+ bash_histsize = getenv("HISTSIZE");
+ if(bash_histsize) {
+ str_to_positive_integers(bash_histsize, &nb_lines_max, 1);
+ }
break;
default:
}
}
- if(show_help || error) {
- if(error) {
- usage(stderr);
- exit(EXIT_FAILURE);
- } else {
- usage(stdout);
- exit(EXIT_SUCCESS);
- }
+ if(error) {
+ usage(stderr);
+ exit(EXIT_FAILURE);
+ }
+
+ if(show_help) {
+ usage(stdout);
+ exit(EXIT_SUCCESS);
}
lines = safe_malloc(nb_lines_max * sizeof(char *));