colorize 0.57

[colorize.git] / colorize.c

diff --git a/colorize.c b/colorize.c
index c54cec731b6403a5f360718268e40a001df683e0..7bd79d0dece86609cc51ed808b1d5a1b8af4d14a 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -104,11 +104,13 @@
  && (streq (color_names[color2]->name, "none")     \
   || streq (color_names[color2]->name, "default")) \
 
+#define ALLOC_COMPLETE_PART_LINE 8
+
 #define COLOR_SEP_CHAR '/'
 
 #define DEBUG_FILE "debug.txt"
 
-#define VERSION "0.56"
+#define VERSION "0.57"
 
 typedef enum { false, true } bool;
 
@@ -213,7 +215,7 @@ static void read_print_stream (bool, const struct color **, const char *, FILE *
 static void merge_print_line (bool, const struct color **, const char *, const char *, FILE *);
 static void complete_part_line (const char *, char **, FILE *);
 static bool get_next_char (char *, const char **, FILE *, bool *);
-static void save_char (char, char **, unsigned int *);
+static void save_char (char, char **, unsigned long *, size_t *);
 static void find_color_entries (struct color_name **, const struct color **);
 static void find_color_entry (const struct color_name *, unsigned int, const struct color **);
 static void print_line (bool, const struct color **, const char * const, unsigned int);
@@ -748,10 +750,11 @@ read_print_stream (bool bold, const struct color **colors, const char *file, FIL
             print_line (bold, colors, line, flags);
             line = p;
           }
-        if (feof (stream)) {
-          if (*line != '\0')
-            print_line (bold, colors, line, 0);
-        }
+        if (feof (stream))
+          {
+            if (*line != '\0')
+              print_line (bold, colors, line, 0);
+          }
         else if (*line != '\0')
           {
             char *p;
@@ -766,14 +769,13 @@ read_print_stream (bool bold, const struct color **colors, const char *file, FIL
 static void
 merge_print_line (bool bold, const struct color **colors, const char *line, const char *p, FILE *stream)
 {
-    char *buf = xmalloc (1);
+    char *buf = NULL;
     char *merged_part_line = NULL;
     const char *part_line;
 
-    *buf = '\0';
     complete_part_line (p + 1, &buf, stream);
 
-    if (*buf != '\0')
+    if (buf)
       part_line = merged_part_line = str_concat (line, buf);
     else
       part_line = line;
@@ -794,14 +796,15 @@ complete_part_line (const char *p, char **buf, FILE *stream)
 {
     bool got_next_char = false, read_from_stream;
     char ch;
-    unsigned int i = 0;
+    unsigned long i = 0;
+    size_t size;
 
     if (get_next_char (&ch, &p, stream, &read_from_stream))
       {
         if (ch == '[')
           {
             if (read_from_stream)
-              save_char (ch, buf, &i);
+              save_char (ch, buf, &i, &size);
           }
         else
           {
@@ -818,7 +821,7 @@ complete_part_line (const char *p, char **buf, FILE *stream)
         if (isdigit (ch) || ch == ';')
           {
             if (read_from_stream)
-              save_char (ch, buf, &i);
+              save_char (ch, buf, &i, &size);
           }
         else /* read next character */
           {
@@ -832,7 +835,7 @@ complete_part_line (const char *p, char **buf, FILE *stream)
         if (ch == 'm')
           {
             if (read_from_stream)
-              save_char (ch, buf, &i);
+              save_char (ch, buf, &i, &size);
           }
         else
           {
@@ -873,9 +876,19 @@ get_next_char (char *ch, const char **p, FILE *stream, bool *read_from_stream)
 }
 
 static void
-save_char (char ch, char **buf, unsigned int *i)
+save_char (char ch, char **buf, unsigned long *i, size_t *size)
 {
-    *buf = xrealloc (*buf, *i + 2); /* +1: size of buf, +1: space for NUL */
+    if (!*buf)
+      {
+        *size = ALLOC_COMPLETE_PART_LINE;
+        *buf = xmalloc (*size);
+      }
+    /* +1: effective occupied size of buffer */
+    else if ((*i + 1) == *size)
+      {
+        *size *= 2;
+        *buf = xrealloc (*buf, *size);
+      }
     (*buf)[*i] = ch;
     (*buf)[*i + 1] = '\0';
     (*i)++;