#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.6"
+#define VERSION "1.1.7"
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 16384
/* Yeah, global variables! */
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\n");
fprintf(out, " -j, --show-long-lines\n");
- fprintf(out, " print three dots at the end of truncated lines\n");
+ fprintf(out, " print a long-line indicator at the end of truncated lines\n");
fprintf(out, " -y, --show-hits\n");
fprintf(out, " highlight the matching substrings\n");
fprintf(out, " -u, --upper-case-makes-case-sensitive\n");
fprintf(out, " -- all following arguments are filenames\n");
fprintf(out, " -t <title>, --title <title>\n");
fprintf(out, " add a title in the modeline\n");
+ fprintf(out, " -r <pattern>, --pattern <pattern>\n");
+ fprintf(out, " set an initial pattern\n");
fprintf(out, " -c <colors>, --colors <colors>\n");
fprintf(out, " set the display colors with an argument of the form\n");
fprintf(out, " <fg_modeline>,<bg_modeline>,<fg_highlight>,<bg_highlight>\n");
fprintf(out, " -s <pattern separator>, --pattern-separator <pattern separator>\n");
fprintf(out, " set the symbol to separate substrings in the pattern\n");
fprintf(out, " -x <label separator>, --label-separator <label separator>\n");
- fprintf(out, " set the symbol to terminate the label\n");
+ fprintf(out, " set the character to separate the label to show from the\n");
+ fprintf(out, " string to return\n");
fprintf(out, " -l <max number of lines>, --number-of-lines <max number of lines>\n");
fprintf(out, " set the maximum number of lines to take into account\n");
fprintf(out, "\n");
addnstr("\\", 1);
attroff(attr_focus_line);
} else {
- buffer[k++] = '\n';
- buffer[k++] = '\0';
-
+ if(k < console_width) {
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+ }
print_string_with_switches(buffer, k,
nb_switches / 2, switches);
}
char raw_line[BUFFER_SIZE];
char *s;
FILE *file;
+ int l;
file = fopen(input_filename, "r");
exit(EXIT_FAILURE);
}
- while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
- for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
- *s = '\0';
+ if(label_separator == '\n') {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ l = strlen(raw_line);
+ fgets(raw_line + l, BUFFER_SIZE - l, file);
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
+ }
+ } else {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
}
- store_line(hash_table, raw_line, nb_lines, lines);
}
fclose(file);
{ "show-hits", no_argument, 0, 'j'},
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
+ { "pattern", 1, 0, 'r' },
{ "number-of-lines", 1, 0, 'l' },
{ "colors", 1, 0, 'c' },
{ "bash", no_argument, 0, OPT_BASH_MODE },
exit(EXIT_FAILURE);
}
+ pattern[0] = '\0';
+
color_fg_modeline = COLOR_WHITE;
color_bg_modeline = COLOR_BLACK;
color_fg_highlight = COLOR_BLACK;
strcpy(output_filename, "");
- while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:l:c:-h",
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:r:l:c:-h",
long_options, NULL)) != -1) {
switch(c) {
break;
case 'x':
- label_separator = optarg[0];
+ if(strcmp(optarg, "\\n") == 0) {
+ label_separator = '\n';
+ } else {
+ label_separator = optarg[0];
+ }
break;
case 'v':
strcpy(title, optarg);
break;
+ case 'r':
+ strcpy(pattern, optarg);
+ break;
+
case 'l':
str_to_positive_integers(optarg, &nb_lines_max, 1);
break;
*s = '\0';
}
- pattern[0] = '\0';
-
cursor_position = 0;
/* Here we start to display with curse */
current_focus_line = 0;
displayed_focus_line = 0;
+ cursor_position = strlen(pattern);
update_screen(¤t_focus_line, &displayed_focus_line,
0,