X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=colorize.c;h=a891135fdd4772710481ff8607f9d7782cee7ff6;hb=3180102d0475ab9686cfe9c9c7501d4eec567db6;hp=7bd79d0dece86609cc51ed808b1d5a1b8af4d14a;hpb=6be9faf1cbf403d2a855d97c1764de94bd61ae87;p=colorize.git diff --git a/colorize.c b/colorize.c index 7bd79d0..a891135 100644 --- a/colorize.c +++ b/colorize.c @@ -2,7 +2,7 @@ * colorize - Read text from standard input stream or file and print * it colorized through use of ANSI escape sequences * - * Copyright (c) 2011-2015 Steven Schubiger + * Copyright (c) 2011-2016 Steven Schubiger * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -106,11 +106,17 @@ #define ALLOC_COMPLETE_PART_LINE 8 -#define COLOR_SEP_CHAR '/' +#if defined(COLOR_SEP_CHAR_COLON) +# define COLOR_SEP_CHAR ':' +#elif defined(COLOR_SEP_CHAR_SLASH) +# define COLOR_SEP_CHAR '/' +#else +# define COLOR_SEP_CHAR '/' +#endif #define DEBUG_FILE "debug.txt" -#define VERSION "0.57" +#define VERSION "0.59" typedef enum { false, true } bool; @@ -119,8 +125,6 @@ struct color_name { char *orig; }; -static struct color_name *color_names[3] = { NULL, NULL, NULL }; - struct color { const char *name; const char *code; @@ -177,7 +181,7 @@ static const char *formats[] = { "%s: %s: %s", /* type */ }; -enum { FOREGROUND, BACKGROUND }; +enum { GENERIC, FOREGROUND = 0, BACKGROUND }; static const struct { struct color const *entries; @@ -188,6 +192,23 @@ static const struct { { bg_colors, sizeof (bg_colors) / sizeof (struct color), "background" }, }; +enum { + OPT_CLEAN = 1, + OPT_CLEAN_ALL, + OPT_EXCLUDE_RANDOM, + OPT_HELP, + OPT_VERSION +}; +static int opt_type; +static const struct option long_opts[] = { + { "clean", no_argument, &opt_type, OPT_CLEAN }, + { "clean-all", no_argument, &opt_type, OPT_CLEAN_ALL }, + { "exclude-random", required_argument, &opt_type, OPT_EXCLUDE_RANDOM }, + { "help", no_argument, &opt_type, OPT_HELP }, + { "version", no_argument, &opt_type, OPT_VERSION }, + { NULL, 0, NULL, 0 }, +}; + static FILE *stream; #if DEBUG static FILE *log; @@ -211,11 +232,13 @@ static void cleanup (void); static void free_color_names (struct color_name **); static void process_args (unsigned int, char **, bool *, const struct color **, const char **, FILE **); static void process_file_arg (const char *, const char **, FILE **); +static void skip_path_colors (const char *, const char *, const struct stat *); +static void gather_color_names (const char *, bool *, struct color_name **); 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 merge_print_line (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 long *, size_t *); +static void save_char (char, char **, size_t *, 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); @@ -257,7 +280,7 @@ extern int optind; int main (int argc, char **argv) { - unsigned int arg_cnt = 0; + unsigned int arg_cnt; bool bold = false; @@ -322,29 +345,11 @@ main (int argc, char **argv) goto PARSE_OPT; \ extern char *optarg; -static int opt_type; static void process_opts (int argc, char **argv) { - enum { - OPT_CLEAN = 1, - OPT_CLEAN_ALL, - OPT_EXCLUDE_RANDOM, - OPT_HELP, - OPT_VERSION - }; - int opt; - struct option long_opts[] = { - { "clean", no_argument, &opt_type, OPT_CLEAN }, - { "clean-all", no_argument, &opt_type, OPT_CLEAN_ALL }, - { "exclude-random", required_argument, &opt_type, OPT_EXCLUDE_RANDOM }, - { "help", no_argument, &opt_type, OPT_HELP }, - { "version", no_argument, &opt_type, OPT_VERSION }, - { NULL, 0, NULL, 0 }, - }; - while ((opt = getopt_long (argc, argv, "hV", long_opts, NULL)) != -1) { PARSE_OPT: @@ -364,9 +369,9 @@ process_opts (int argc, char **argv) unsigned int i; exclude = xstrdup (optarg); STACK_VAR (exclude); - for (i = 1; i < tables[FOREGROUND].count - 1; i++) /* skip color none and default */ + for (i = 1; i < tables[GENERIC].count - 1; i++) /* skip color none and default */ { - const struct color *entry = &tables[FOREGROUND].entries[i]; + const struct color *entry = &tables[GENERIC].entries[i]; if (streq (exclude, entry->name)) { valid = true; @@ -409,6 +414,15 @@ print_hint (void) static void print_help (void) { + struct short_opt { + const char *name; + const char *short_opt; + }; + const struct short_opt short_opts[] = { + { "help", "h" }, + { "version", "V" }, + }; + const struct option *opt = long_opts; unsigned int i; printf ("Usage: %s (foreground) OR (foreground)%c(background) OR --clean[-all] [-|file]\n\n", program_name, COLOR_SEP_CHAR); @@ -430,11 +444,24 @@ print_help (void) printf ("\twhereas for lower case colors will be of normal intensity.\n"); printf ("\n\tOptions\n"); - printf ("\t\t --clean\n"); - printf ("\t\t --clean-all\n"); - printf ("\t\t --exclude-random\n"); - printf ("\t\t-h, --help\n"); - printf ("\t\t-V, --version\n\n"); + for (; opt->name; opt++) + { + const char *short_opt = NULL; + unsigned int i; + for (i = 0; i < sizeof (short_opts) / sizeof (struct short_opt); i++) + { + if (streq (opt->name, short_opts[i].name)) + { + short_opt = short_opts[i].short_opt; + break; + } + } + if (short_opt) + printf ("\t\t-%s, --%s\n", short_opt, opt->name); + else + printf ("\t\t --%s\n", opt->name); + } + printf ("\n"); } static void @@ -474,14 +501,13 @@ print_version (void) } else printf ("Buffer size: %lu byte%s\n", (unsigned long)BUF_SIZE, BUF_SIZE > 1 ? "s" : ""); + printf ("Color separator: '%c'\n", COLOR_SEP_CHAR); printf ("Debugging: %s\n", debug ? "yes" : "no"); } static void cleanup (void) { - free_color_names (color_names); - if (stream && fileno (stream) != STDIN_FILENO) fclose (stream); #if DEBUG @@ -493,9 +519,7 @@ cleanup (void) { unsigned int i; for (i = 0; i < stacked_vars; i++) - if (vars_list[i]) - free (vars_list[i]); - + free (vars_list[i]); free_null (vars_list); } } @@ -506,9 +530,9 @@ free_color_names (struct color_name **color_names) unsigned int i; for (i = 0; color_names[i]; i++) { - free (color_names[i]->name); - free (color_names[i]->orig); - free_null (color_names[i]); + RELEASE_VAR (color_names[i]->name); + RELEASE_VAR (color_names[i]->orig); + RELEASE_VAR (color_names[i]); } } @@ -516,9 +540,9 @@ static void process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct color **colors, const char **file, FILE **stream) { int ret; - unsigned int index; - char *color, *p, *str; + char *p; struct stat sb; + struct color_name *color_names[3] = { NULL, NULL, NULL }; const char *color_string = arg_cnt >= 1 ? arg_strings[0] : NULL; const char *file_string = arg_cnt == 2 ? arg_strings[1] : NULL; @@ -538,53 +562,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct /* Ensure that we don't fail if there's a file with one or more color names in its path. */ if (ret == 0) /* success */ - { - bool have_file; - unsigned int c; - const char *color = color_string; - const mode_t mode = sb.st_mode; - - for (c = 1; c <= 2 && *color; c++) - { - bool matched = false; - unsigned int i; - for (i = 0; i < tables[FOREGROUND].count; i++) - { - const struct color *entry = &tables[FOREGROUND].entries[i]; - if (has_color_name (color, entry->name)) - { - color += strlen (entry->name); - matched = true; - break; - } - } - if (!matched && has_color_name (color, "random")) - { - color += strlen ("random"); - matched = true; - } - if (matched && *color == COLOR_SEP_CHAR && *(color + 1)) - color++; - else - break; - } - - have_file = (*color != '\0'); - - if (have_file) - { - const char *file_exists = color_string; - if (file_string) - vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "cannot be used as color string"); - else - { - if (VALID_FILE_TYPE (mode)) - vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "must be preceeded by color string"); - else - vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "is not a valid file type"); - } - } - } + skip_path_colors (color_string, file_string, &sb); if ((p = strchr (color_string, COLOR_SEP_CHAR))) { @@ -596,59 +574,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct vfprintf_fail (formats[FMT_STRING], "one color pair allowed only for string", color_string); } - str = xstrdup (color_string); - STACK_VAR (str); - - for (index = 0, color = str; *color; index++, color = p) - { - char *ch, *sep; - - p = NULL; - if ((sep = strchr (color, COLOR_SEP_CHAR))) - { - *sep = '\0'; - p = sep + 1; - } - else - p = color + strlen (color); - assert (p); - - for (ch = color; *ch; ch++) - if (!isalpha (*ch)) - vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color, "cannot be made of non-alphabetic characters"); - - for (ch = color + 1; *ch; ch++) - if (!islower (*ch)) - vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color, "cannot be in mixed lower/upper case"); - - if (streq (color, "None")) - vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color, "cannot be bold"); - - if (isupper (*color)) - { - switch (index) - { - case FOREGROUND: - *bold = true; - break; - case BACKGROUND: - vfprintf_fail (formats[FMT_COLOR], tables[BACKGROUND].desc, color, "cannot be bold"); - default: /* never reached */ - ABORT_TRACE (); - } - } - - color_names[index] = xcalloc (1, sizeof (struct color_name)); - - color_names[index]->orig = xstrdup (color); - - for (ch = color; *ch; ch++) - *ch = tolower (*ch); - - color_names[index]->name = xstrdup (color); - } - - RELEASE_VAR (str); + gather_color_names (color_string, bold, color_names); assert (color_names[FOREGROUND]); @@ -715,6 +641,120 @@ process_file_arg (const char *file_string, const char **file, FILE **stream) assert (*file); } +static void +skip_path_colors (const char *color_string, const char *file_string, const struct stat *sb) +{ + bool have_file; + unsigned int c; + const char *color = color_string; + const mode_t mode = sb->st_mode; + + for (c = 1; c <= 2 && *color; c++) + { + bool matched = false; + unsigned int i; + for (i = 0; i < tables[GENERIC].count; i++) + { + const struct color *entry = &tables[GENERIC].entries[i]; + if (has_color_name (color, entry->name)) + { + color += strlen (entry->name); + matched = true; + break; + } + } + if (!matched && has_color_name (color, "random")) + { + color += strlen ("random"); + matched = true; + } + if (matched && *color == COLOR_SEP_CHAR && *(color + 1)) + color++; + else + break; + } + + have_file = (*color != '\0'); + + if (have_file) + { + const char *file_exists = color_string; + if (file_string) + vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "cannot be used as color string"); + else + { + if (VALID_FILE_TYPE (mode)) + vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "must be preceeded by color string"); + else + vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "is not a valid file type"); + } + } +} + +static void +gather_color_names (const char *color_string, bool *bold, struct color_name **color_names) +{ + unsigned int index; + char *color, *p, *str; + + str = xstrdup (color_string); + STACK_VAR (str); + + for (index = 0, color = str; *color; index++, color = p) + { + char *ch, *sep; + + p = NULL; + if ((sep = strchr (color, COLOR_SEP_CHAR))) + { + *sep = '\0'; + p = sep + 1; + } + else + p = color + strlen (color); + assert (p); + + for (ch = color; *ch; ch++) + if (!isalpha (*ch)) + vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color, "cannot be made of non-alphabetic characters"); + + for (ch = color + 1; *ch; ch++) + if (!islower (*ch)) + vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color, "cannot be in mixed lower/upper case"); + + if (streq (color, "None")) + vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color, "cannot be bold"); + + if (isupper (*color)) + { + switch (index) + { + case FOREGROUND: + *bold = true; + break; + case BACKGROUND: + vfprintf_fail (formats[FMT_COLOR], tables[BACKGROUND].desc, color, "cannot be bold"); + default: /* never reached */ + ABORT_TRACE (); + } + } + + color_names[index] = xcalloc (1, sizeof (struct color_name)); + STACK_VAR (color_names[index]); + + color_names[index]->orig = xstrdup (color); + STACK_VAR (color_names[index]->orig); + + for (ch = color; *ch; ch++) + *ch = tolower (*ch); + + color_names[index]->name = xstrdup (color); + STACK_VAR (color_names[index]->name); + } + + RELEASE_VAR (str); +} + static void read_print_stream (bool bold, const struct color **colors, const char *file, FILE *stream) { @@ -726,10 +766,10 @@ read_print_stream (bool bold, const struct color **colors, const char *file, FIL size_t bytes_read; char *eol; const char *line; - memset (buf, '\0', BUF_SIZE + 1); bytes_read = fread (buf, 1, BUF_SIZE, stream); if (bytes_read != BUF_SIZE && ferror (stream)) vfprintf_fail (formats[FMT_ERROR], BUF_SIZE, "read"); + buf[bytes_read] = '\0'; line = buf; while ((eol = strpbrk (line, "\n\r"))) { @@ -759,7 +799,7 @@ read_print_stream (bool bold, const struct color **colors, const char *file, FIL { char *p; if ((clean || clean_all) && (p = strrchr (line, '\033'))) - merge_print_line (bold, colors, line, p, stream); + merge_print_line (line, p, stream); else print_line (bold, colors, line, 0); } @@ -767,27 +807,33 @@ 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) +merge_print_line (const char *line, const char *p, FILE *stream) { char *buf = NULL; - char *merged_part_line = NULL; - const char *part_line; + char *merged_esc = NULL; + const char *esc = ""; + const char char_restore = *p; complete_part_line (p + 1, &buf, stream); if (buf) - part_line = merged_part_line = str_concat (line, buf); - else - part_line = line; - free (buf); + { + /* form escape sequence */ + esc = merged_esc = str_concat (p, buf); + /* shorten partial line accordingly */ + *(char *)p = '\0'; + free (buf); + } #ifdef TEST_MERGE_PART_LINE - printf ("%s", part_line); - free (merged_part_line); - exit (EXIT_SUCCESS); + printf ("%s%s", line, esc); + fflush (stdout); + _exit (EXIT_SUCCESS); #else - print_line (bold, colors, part_line, 0); - free (merged_part_line); + print_clean (line); + *(char *)p = char_restore; + print_clean (esc); + free (merged_esc); #endif } @@ -796,8 +842,7 @@ complete_part_line (const char *p, char **buf, FILE *stream) { bool got_next_char = false, read_from_stream; char ch; - unsigned long i = 0; - size_t size; + size_t i = 0, size; if (get_next_char (&ch, &p, stream, &read_from_stream)) { @@ -876,7 +921,7 @@ get_next_char (char *ch, const char **p, FILE *stream, bool *read_from_stream) } static void -save_char (char ch, char **buf, unsigned long *i, size_t *size) +save_char (char ch, char **buf, size_t *i, size_t *size) { if (!*buf) { @@ -1051,7 +1096,7 @@ gather_esc_offsets (const char *p, const char **start, const char **end) if (*p == 27 && *(p + 1) == '[') { bool valid = false; - const char *begin = p; + const char *const begin = p; p += 2; if (clean_all) valid = validate_esc_clean_all (&p);