#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, " -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");
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);
break;
case 'x':
- label_separator = optarg[0];
+ if(strcmp(optarg, "\\n") == 0) {
+ label_separator = '\n';
+ } else {
+ label_separator = optarg[0];
+ }
break;
case 'v':