Starting to convert to basic C.

diff --git a/selector.cc b/selector.cc
index 2dadb5d..fb08373 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -25,8 +25,8 @@
 // To use it as a super-history-search for bash:
 // selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
 
-#include <fstream>
-#include <iostream>
+// #include <fstream>
+// #include <iostream>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,6 +37,7 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <regex.h>
+#include <locale.h>
 
 using namespace std;
 
@@ -88,10 +89,8 @@ void inject_into_tty_buffer(char *string) {
 
 void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   if(n_opt + n >= argc) {
-    cerr << "Missing argument for " << argv[n_opt] << "."
-         << " "
-         << "Expecting " << help << "."
-         << endl;
+    fprintf(stderr, "Missing argument for %s, expecting %s.\n",
+            argv[n_opt], help);
     exit(1);
   }
 }
@@ -109,7 +108,7 @@ int string_to_positive_integer(char *string) {
   } else error = 1;
 
   if(error) {
-    cerr << "Value `" << string << "' is not a positive integer." << endl;
+    fprintf(stderr, "Value `%s' is not a positive integer.\n", string);
     exit(1);
   }
 
@@ -566,69 +565,83 @@ void read_file(const char *input_filename,
                int nb_lines_max, int *nb_lines, char **lines,
                int hash_table_size, int *hash_table) {
 
-  char raw_line[buffer_size];;
+  char raw_line[buffer_size];
 
-  ifstream file(input_filename);
+  FILE *file = fopen(input_filename, "r");
 
-  if(file.fail()) {
-    cerr << "Can not open " << input_filename << endl;
+  if(!file) {
+    fprintf(stderr, "Can not open `%s'.\n", input_filename);
     exit(1);
   }
 
-  while(*nb_lines < nb_lines_max && !file.eof()) {
+  int start = 0, end = 0;
 
-    file.getline(raw_line, buffer_size);
+  while(*nb_lines < nb_lines_max && (end > start || !feof(file))) {
+    int eol = start;
+    while(eol < end && raw_line[eol] != '\n') eol++;
 
-    if(raw_line[0]) {
-
-      if(file.fail()) {
-        cerr << "Line too long:" << endl;
-        cerr << raw_line << endl;
-        exit(1);
+    if(eol == end) {
+      for(int k = 0; k < end - start; k++) {
+        raw_line[k] = raw_line[k + start];
       }
+      end -= start;
+      eol -= start;
+      start = 0;
+      end += fread(raw_line + end, sizeof(char), buffer_size - end, file);
+      while(eol < end && raw_line[eol] != '\n') eol++;
+    }
 
-      char *t;
+    if(eol == buffer_size) {
+      raw_line[buffer_size - 1] = '\0';
+      fprintf(stderr, "Line too long:\n");
+      fprintf(stderr, raw_line);
+      fprintf(stderr, "\n");
+      exit(1);
+    }
 
-      t = raw_line;
+    raw_line[eol] = '\0';
 
-      // Remove the zsh history prefix
+    char *t = raw_line + start;
 
-      if(zsh_history && *t == ':') {
-        while(*t && *t != ';') t++;
-        if(*t == ';') t++;
-      }
+    // Remove the zsh history prefix
 
-      // Remove the bash history prefix
+    if(zsh_history && *t == ':') {
+      while(*t && *t != ';') t++;
+      if(*t == ';') t++;
+    }
 
-      if(bash_history) {
-        while(*t == ' ') t++;
-        while(*t >= '0' && *t <= '9') t++;
-        while(*t == ' ') t++;
-      }
+    // Remove the bash history prefix
 
-      // Check for duplicates with the hash table and insert the line
-      // in the list if necessary
+    if(bash_history) {
+      while(*t == ' ') t++;
+      while(*t >= '0' && *t <= '9') t++;
+      while(*t == ' ') t++;
+    }
 
-      int dup;
+    // Check for duplicates with the hash table and insert the line
+    // in the list if necessary
 
-      if(hash_table) {
-        dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
-      } else {
-        dup = -1;
-      }
+    int dup;
 
-      if(dup < 0) {
-        lines[*nb_lines] = new char[strlen(t) + 1];
-        strcpy(lines[*nb_lines], t);
-      } else {
-        // The string was already in there, so we do not allocate a
-        // new string but use the pointer to the first occurence of it
-        lines[*nb_lines] = lines[dup];
-        lines[dup] = 0;
-      }
+    if(hash_table) {
+      dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
+    } else {
+      dup = -1;
+    }
 
-      (*nb_lines)++;
+    if(dup < 0) {
+      lines[*nb_lines] = new char[strlen(t) + 1];
+      strcpy(lines[*nb_lines], t);
+    } else {
+      // The string was already in there, so we do not allocate a
+      // new string but use the pointer to the first occurence of it
+      lines[*nb_lines] = lines[dup];
+      lines[dup] = 0;
     }
+
+    (*nb_lines)++;
+
+    start = eol + 1;
   }
 }
 
@@ -637,7 +650,7 @@ void read_file(const char *input_filename,
 int main(int argc, char **argv) {
 
   if(!ttyname(STDIN_FILENO)) {
-    cerr << "The standard input is not a tty." << endl;
+    fprintf(stderr, "The standard input is not a tty.\n");
     exit(1);
   }
 
@@ -770,45 +783,41 @@ int main(int argc, char **argv) {
     }
 
     else {
-      cerr << "Unknown option " << argv[i] << "." << endl;
+      fprintf(stderr, "Unknown option %s.\n", argv[i]);
       error = 1;
     }
   }
 
   if(show_help || error) {
-    cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
-         << endl
-         << "Written by Francois Fleuret <francois@fleuret.org>."
-         << endl
-         << endl
-         << "Usage: " << argv[0] << " [options] [<filename1> [<filename2> ...]]" << endl
-         << endl
-         << " -h      show this help" << endl
-         << " -v      inject the selected line in the tty" << endl
-         << " -w      quote control characters with ^Qs when using -v" << endl
-         << " -d      remove duplicated lines" << endl
-         << " -b      remove the bash history line prefix" << endl
-         << " -z      remove the zsh history line prefix" << endl
-         << " -i      invert the order of lines" << endl
-         << " -e      start in regexp mode" << endl
-         << " -a      start in case sensitive mode" << endl
-         << " -m      monochrome mode" << endl
-         << " -q      make a flash instead of a beep on an edition error" << endl
-         << " --      all following arguments are filenames" << endl
-         << " -t <title>" << endl
-         << "         add a title in the modeline" << endl
-         << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
-         << "         set the display colors" << endl
-         << " -o <output filename>" << endl
-         << "         set a file to write the selected line to" << endl
-         << " -s <pattern separator>" << endl
-         << "         set the symbol to separate substrings in the pattern" << endl
-         << " -x <label separator>" << endl
-         << "         set the symbol to terminate the label" << endl
-         << " -l <max number of lines>" << endl
-         << "         set the maximum number of lines to take into account" << endl
-         << endl;
-
+    fprintf(stderr, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER);
+    fprintf(stderr, "Written by Francois Fleuret <francois@fleuret.org>.\n");
+    fprintf(stderr, "Usage: %s [options] [<filename1> [<filename2> ...]]\n", argv[0]);
+    fprintf(stderr, "\n");
+    fprintf(stderr, " -h      show this help\n");
+    fprintf(stderr, " -v      inject the selected line in the tty\n");
+    fprintf(stderr, " -w      quote control characters with ^Qs when using -v\n");
+    fprintf(stderr, " -d      remove duplicated lines\n");
+    fprintf(stderr, " -b      remove the bash history line prefix\n");
+    fprintf(stderr, " -z      remove the zsh history line prefix\n");
+    fprintf(stderr, " -i      invert the order of lines\n");
+    fprintf(stderr, " -e      start in regexp mode\n");
+    fprintf(stderr, " -a      start in case sensitive mode\n");
+    fprintf(stderr, " -m      monochrome mode\n");
+    fprintf(stderr, " -q      make a flash instead of a beep on an edition error\n");
+    fprintf(stderr, " --      all following arguments are filenames\n");
+    fprintf(stderr, " -t <title>\n");
+    fprintf(stderr, "         add a title in the modeline\n");
+    fprintf(stderr, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n");
+    fprintf(stderr, "         set the display colors\n");
+    fprintf(stderr, " -o <output filename>\n");
+    fprintf(stderr, "         set a file to write the selected line to\n");
+    fprintf(stderr, " -s <pattern separator>\n");
+    fprintf(stderr, "         set the symbol to separate substrings in the pattern\n");
+    fprintf(stderr, " -x <label separator>\n");
+    fprintf(stderr, "         set the symbol to terminate the label\n");
+    fprintf(stderr, " -l <max number of lines>\n");
+    fprintf(stderr, "         set the maximum number of lines to take into account\n");
+    fprintf(stderr, "\n");
     exit(error);
   }
 
@@ -912,7 +921,7 @@ int main(int argc, char **argv) {
        color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
       echo();
       endwin();
-      cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
+      fprintf(stderr, "Color numbers have to be between 0 and %d.\n", COLORS - 1);
       exit(1);
     }
 
@@ -1056,22 +1065,21 @@ int main(int argc, char **argv) {
     }
 
     if(output_filename[0]) {
-      ofstream out(output_filename);
-      if(out.fail()) {
-        cerr << "Can not open " << output_filename << " for writing." << endl;
-        exit(1);
-      } else {
+      FILE *out = fopen(output_filename, "w");
+      if(out) {
         if(t) {
-          out << t << endl;
-        } else {
-          out << endl;
+          fprintf(out, t);
         }
+        fprintf(out, "\n");
+      } else {
+        fprintf(stderr, "Can not open %s for writing.\n", output_filename);
+        exit(1);
       }
-      out.flush();
+      fclose(out);
     }
 
   } else {
-    cout << "Aborted." << endl;
+    printf("Aborted.\n");
   }
 
   for(int l = 0; l < nb_lines; l++) {