X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=9c669f78e0dba5f161abf52b49720d7f93c1fd22;hb=8c08e0c2af99b1855d857c29c84b81bef5ef3de5;hp=f8d133e83a7ddb67fa50433b11a0a7379cf2a110;hpb=ee52e852c5fffa8a29c5476f2b68cd0ebcbd32b7;p=selector.git diff --git a/selector.cc b/selector.cc index f8d133e..9c669f7 100644 --- a/selector.cc +++ b/selector.cc @@ -56,16 +56,14 @@ int use_regexp = 0; ////////////////////////////////////////////////////////////////////// -// This looks severely Linux-only ... - -void inject_into_tty_buffer(char *line) { +void inject_into_tty_buffer(char *string) { struct termios oldtio, newtio; - tcgetattr(STDIN_FILENO,&oldtio); + tcgetattr(STDIN_FILENO, &oldtio); memset(&newtio, 0, sizeof(newtio)); // Set input mode (non-canonical, *no echo*,...) tcsetattr(STDIN_FILENO, TCSANOW, &newtio); - // Put the selected line in the tty input buffer - for(char *k = line; *k; k++) { + // Put the selected string in the tty input buffer + for(char *k = string; *k; k++) { ioctl(STDIN_FILENO, TIOCSTI, k); } // Restore the old settings @@ -499,13 +497,13 @@ int main(int argc, char **argv) { << "Usage: " << argv[0] << " [options] -f " << endl << endl << " -h show this help" << endl - << " -v inject the selection in the tty" << endl - << " -m monochrome mode" << endl + << " -v inject the selected line in the tty" << endl << " -d remove duplicated lines" << endl - << " -e regexp mode when starting" << endl << " -b remove the bash history line prefix" << endl << " -z remove the zsh history line prefix" << endl - << " -i invert the line order" << endl + << " -i invert the order of lines" << endl + << " -e start in regexp mode" << endl + << " -m monochrome mode" << endl << " -c " << endl << " set the display colors" << endl << " -o " << endl @@ -546,7 +544,7 @@ int main(int argc, char **argv) { file.getline(raw_line, buffer_size); - if(strcmp(raw_line, "") != 0) { + if(raw_line[0]) { char *s, *t; const char *u;