From 14ec5acdfc9016b4d22425a02a65280d712815d0 Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Fri, 13 Mar 2009 21:31:40 +0100 Subject: [PATCH] Added a -b flag to remove the leading number in the bash history. --- selector.cc | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/selector.cc b/selector.cc index 2418ae9..56e6a23 100644 --- a/selector.cc +++ b/selector.cc @@ -22,8 +22,9 @@ * */ -// To use it as a super-history-search: -// ./selector -v -f ${HISTFILE} +// To use it as a super-history-search for bash: +// +// alias h='./selector -i -b -v -f <(history)' // This software is highly Linux-specific, but I would be glad to get // patches to make it work on other OS @@ -51,7 +52,7 @@ int nb_lines_max = 10000; char pattern_separator = ';'; int output_to_vt_buffer = 0; int with_colors = 1; -int zsh_history = 0; +int zsh_history = 0, bash_history = 0; int inverse_order = 0; ////////////////////////////////////////////////////////////////////// @@ -341,8 +342,8 @@ int main(int argc, char **argv) { int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; - color_fg_modeline = COLOR_WHITE; - color_bg_modeline = COLOR_BLACK; + color_fg_modeline = COLOR_WHITE; + color_bg_modeline = COLOR_BLACK; color_fg_highlight = COLOR_BLACK; color_bg_highlight = COLOR_YELLOW; @@ -355,6 +356,7 @@ int main(int argc, char **argv) { int i = 1; while(i < argc) { + if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(output_filename, argv[i+1], buffer_size); @@ -383,10 +385,10 @@ int main(int argc, char **argv) { i += 2; } - else if(strcmp(argv[i], "-b") == 0) { - no_blink = 1; - i++; - } + // else if(strcmp(argv[i], "-b") == 0) { + // no_blink = 1; + // i++; + // } else if(strcmp(argv[i], "-i") == 0) { inverse_order = 1; @@ -398,6 +400,11 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-b") == 0) { + bash_history = 1; + i++; + } + else if(strcmp(argv[i], "-l") == 0) { check_opt(argc, argv, i, 1, ""); nb_lines_max = atoi(argv[i+1]); @@ -443,6 +450,8 @@ int main(int argc, char **argv) { exit(1); } + int nb_lines = 0; + ifstream file(input_filename); if(file.fail()) { @@ -450,7 +459,6 @@ int main(int argc, char **argv) { return 1; } - int nb_lines = 0; while(nb_lines < nb_lines_max && !file.eof()) { file.getline(buffer, buffer_size); if(strcmp(buffer, "") != 0) { @@ -459,6 +467,11 @@ int main(int argc, char **argv) { while(*s && *s != ';') s++; if(*s == ';') s++; } + + if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { + while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; + } + lines[nb_lines] = new char[strlen(s) + 1]; strcpy(lines[nb_lines], s); nb_lines++; -- 2.39.5