X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=colorize.c;h=7bd79d0dece86609cc51ed808b1d5a1b8af4d14a;hb=6be9faf1cbf403d2a855d97c1764de94bd61ae87;hp=a3e9b03e9a372bfb777f58121fd20a5318803100;hpb=eb0992cd2850cbb12690c5cc74425d4ef7251556;p=colorize.git diff --git a/colorize.c b/colorize.c index a3e9b03..7bd79d0 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-2013 Steven Schubiger + * Copyright (c) 2011-2015 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 @@ -19,7 +19,9 @@ * */ -#define _POSIX_SOURCE +#define _BSD_SOURCE +#define _XOPEN_SOURCE 700 +#define _FILE_OFFSET_BITS 64 #include #include #include @@ -34,27 +36,36 @@ #include #include -#define DEBUG 0 +#ifndef DEBUG +# define DEBUG 0 +#endif #define str(arg) #arg #define to_str(arg) str(arg) #define streq(s1, s2) (strcmp (s1, s2) == 0) -#if DEBUG -# define xmalloc(size) malloc_wrap_debug(size, __FILE__, __LINE__) -# define xrealloc(ptr, size) realloc_wrap_debug(ptr, size, __FILE__, __LINE__) +#if !DEBUG +# define xmalloc(size) malloc_wrap(size) +# define xcalloc(nmemb, size) calloc_wrap(nmemb, size) +# define xrealloc(ptr, size) realloc_wrap(ptr, size) +# define xstrdup(str) strdup_wrap(str, NULL, 0) +# define str_concat(str1, str2) str_concat_wrap(str1, str2, NULL, 0) #else -# define xmalloc(size) malloc_wrap(size) -# define xrealloc(ptr, size) realloc_wrap(ptr, size) +# define xmalloc(size) malloc_wrap_debug(size, __FILE__, __LINE__) +# define xcalloc(nmemb, size) calloc_wrap_debug(nmemb, size, __FILE__, __LINE__) +# define xrealloc(ptr, size) realloc_wrap_debug(ptr, size, __FILE__, __LINE__) +# define xstrdup(str) strdup_wrap(str, __FILE__, __LINE__) +# define str_concat(str1, str2) str_concat_wrap(str1, str2, __FILE__, __LINE__) #endif #define free_null(ptr) free_wrap((void **)&ptr) -#define xstrdup(str) strdup_wrap(str) -#if !defined BUF_SIZE || BUF_SIZE <= 0 +#if defined(BUF_SIZE) && (BUF_SIZE <= 0 || BUF_SIZE > 65536) # undef BUF_SIZE -# define BUF_SIZE 4096 + 1 +#endif +#ifndef BUF_SIZE +# define BUF_SIZE 4096 #endif #define LF 0x01 @@ -62,22 +73,27 @@ #define SKIP_LINE_ENDINGS(flags) (((flags) & CR) && ((flags) & LF) ? 2 : 1) +#define VALID_FILE_TYPE(mode) (S_ISREG (mode) || S_ISLNK (mode) || S_ISFIFO (mode)) + #define STACK_VAR(ptr) do { \ stack_var (&vars_list, &stacked_vars, stacked_vars, ptr); \ -} while (false); +} while (false) #define RELEASE_VAR(ptr) do { \ release_var (vars_list, stacked_vars, (void **)&ptr); \ -} while (false); +} while (false) -#define MEM_ALLOC_FAIL_DEBUG(file, line) do { \ - fprintf (stderr, "Memory allocation failure in source file %s, line %u\n", file, line); \ - exit (2); \ -} while (false); -#define MEM_ALLOC_FAIL() do { \ +#if !DEBUG +# define MEM_ALLOC_FAIL() do { \ fprintf (stderr, "%s: memory allocation failure\n", program_name); \ - exit (2); \ -} while (false); + exit (EXIT_FAILURE); \ +} while (false) +#else +# define MEM_ALLOC_FAIL_DEBUG(file, line) do { \ + fprintf (stderr, "Memory allocation failure in source file %s, line %u\n", file, line); \ + exit (EXIT_FAILURE); \ +} while (false) +#endif #define ABORT_TRACE() \ fprintf (stderr, "Aborting in source file %s, line %u\n", __FILE__, __LINE__); \ @@ -88,13 +104,15 @@ && (streq (color_names[color2]->name, "none") \ || streq (color_names[color2]->name, "default")) \ +#define ALLOC_COMPLETE_PART_LINE 8 + #define COLOR_SEP_CHAR '/' -#define VERSION "0.49" +#define DEBUG_FILE "debug.txt" -typedef unsigned short bool; +#define VERSION "0.57" -enum { false, true }; +typedef enum { false, true } bool; struct color_name { char *name; @@ -115,8 +133,8 @@ static const struct color fg_colors[] = { { "green", "32m" }, { "yellow", "33m" }, { "blue", "34m" }, - { "cyan", "35m" }, - { "magenta", "36m" }, + { "magenta", "35m" }, + { "cyan", "36m" }, { "white", "37m" }, { "default", "39m" }, }; @@ -127,25 +145,36 @@ static const struct color bg_colors[] = { { "green", "42m" }, { "yellow", "43m" }, { "blue", "44m" }, - { "cyan", "45m" }, - { "magenta", "46m" }, + { "magenta", "45m" }, + { "cyan", "46m" }, { "white", "47m" }, { "default", "49m" }, }; +struct bytes_size { + unsigned int size; + char unit; +}; + enum fmts { FMT_GENERIC, + FMT_STRING, + FMT_QUOTE, FMT_COLOR, FMT_RANDOM, FMT_ERROR, - FMT_FILE + FMT_FILE, + FMT_TYPE }; static const char *formats[] = { - "%s", /* generic */ - "%s color '%s' %s", /* color */ - "%s color '%s' %s '%s'", /* random */ - "less than %u bytes %s", /* error */ - "%s: %s", /* file */ + "%s", /* generic */ + "%s '%s'", /* string */ + "%s `%s' %s", /* quote */ + "%s color '%s' %s", /* color */ + "%s color '%s' %s '%s'", /* random */ + "less than %lu bytes %s", /* error */ + "%s: %s", /* file */ + "%s: %s: %s", /* type */ }; enum { FOREGROUND, BACKGROUND }; @@ -159,53 +188,70 @@ static const struct { { bg_colors, sizeof (bg_colors) / sizeof (struct color), "background" }, }; -enum stream_mode { SCAN_FIRST = 1, SCAN_ALWAYS }; - -struct ending { - unsigned int flags; - const char newline[3]; -}; - -static const struct ending endings[] = { - { CR & LF, "\r\n" }, - { CR, "\r" }, - { LF, "\n" }, -}; +static FILE *stream; +#if DEBUG +static FILE *log; +#endif -static FILE *stream = NULL; +static unsigned int stacked_vars; +static void **vars_list; -static unsigned int stacked_vars = 0; -static void **vars_list = NULL; +static bool clean; +static bool clean_all; -static bool clean = false; -static char *exclude = NULL; +static char *exclude; static const char *program_name; +static void process_opts (int, char **); +static void print_hint (void); static void print_help (void); static void print_version (void); static void cleanup (void); static void free_color_names (struct color_name **); -static void process_options (unsigned int, char **, bool *, const struct color **, const char **, FILE **); -static void process_file_option (const char *, const char **, FILE **); -static void read_print_stream (bool, const struct color **, const char *, FILE *, enum stream_mode); +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 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 long *, size_t *); static void find_color_entries (struct color_name **, const struct color **); -static void find_color_entry (const char *const, unsigned int, const struct color **); -static void print_line (const struct color **, bool, const char * const, unsigned int); +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); static void print_clean (const char *); -static void print_free_offsets (const char *, char ***, unsigned int); +static bool is_esc (const char *); +static const char *get_end_of_esc (const char *); +static const char *get_end_of_text (const char *); +static void print_text (const char *, size_t); +static bool gather_esc_offsets (const char *, const char **, const char **); +static bool validate_esc_clean_all (const char **); +static bool validate_esc_clean (int, unsigned int, const char **, bool *); +static bool is_reset (int, unsigned int, const char **); +static bool is_bold (int, unsigned int, const char **); +static bool is_fg_color (int, const char **); +static bool is_bg_color (int, unsigned int, const char **); +#if !DEBUG static void *malloc_wrap (size_t); +static void *calloc_wrap (size_t, size_t); static void *realloc_wrap (void *, size_t); +#else static void *malloc_wrap_debug (size_t, const char *, unsigned int); +static void *calloc_wrap_debug (size_t, size_t, const char *, unsigned int); static void *realloc_wrap_debug (void *, size_t, const char *, unsigned int); +#endif static void free_wrap (void **); -static char *strdup_wrap (const char *); -static char *str_concat (const char *, const char *); +static char *strdup_wrap (const char *, const char *, unsigned int); +static char *str_concat_wrap (const char *, const char *, const char *, unsigned int); +static bool get_bytes_size (unsigned long, struct bytes_size *); +static char *get_file_type (mode_t); +static bool has_color_name (const char *, const char *); +static FILE *open_file (const char *, const char *); +static void vfprintf_diag (const char *, ...); static void vfprintf_fail (const char *, ...); static void stack_var (void ***, unsigned int *, unsigned int, void *); static void release_var (void **, unsigned int, void **); -extern char *optarg; extern int optind; int @@ -213,15 +259,6 @@ main (int argc, char **argv) { unsigned int arg_cnt = 0; - int opt; - struct option long_opts[] = { - { "clean", no_argument, NULL, 'c' }, - { "exclude-random", required_argument, NULL, 'e' }, - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'v' }, - { 0, 0, 0, 0 }, - }; - bool bold = false; const struct color *colors[2] = { @@ -229,79 +266,152 @@ main (int argc, char **argv) NULL, /* background */ }; - const char *file; - - enum stream_mode mode = SCAN_FIRST; + const char *file = NULL; program_name = argv[0]; atexit (cleanup); setvbuf (stdout, NULL, _IOLBF, 0); - while ((opt = getopt_long (argc, argv, "hv", long_opts, NULL)) != -1) - { - switch (opt) - { - case 'c': - clean = true; - break; - case 'e': { - char *p; - exclude = xstrdup (optarg); - STACK_VAR (exclude); - for (p = exclude; *p; p++) - *p = tolower (*p); - if (streq (exclude, "random")) - vfprintf_fail (formats[FMT_GENERIC], "--exclude-random switch must be provided a color"); - break; - } - case 'h': - print_help (); - exit (EXIT_SUCCESS); - case 'v': - print_version (); - exit (EXIT_SUCCESS); - case '?': - print_help (); - exit (EXIT_FAILURE); - default: /* never reached */ - ABORT_TRACE (); - } - } +#if DEBUG + log = open_file (DEBUG_FILE, "w"); +#endif + + process_opts (argc, argv); arg_cnt = argc - optind; - if (clean) + if (clean || clean_all) { + if (clean && clean_all) + vfprintf_fail (formats[FMT_GENERIC], "--clean and --clean-all switch are mutually exclusive"); if (arg_cnt > 1) - vfprintf_fail (formats[FMT_GENERIC], "--clean switch cannot be used with more than one file"); + { + const char *format = "%s %s"; + const char *message = "switch cannot be used with more than one file"; + if (clean) + vfprintf_fail (format, "--clean", message); + else if (clean_all) + vfprintf_fail (format, "--clean-all", message); + } } else { if (arg_cnt == 0 || arg_cnt > 2) { - print_help (); + vfprintf_diag ("%u arguments provided, expected 1-2 arguments or clean option", arg_cnt); + print_hint (); exit (EXIT_FAILURE); } } - if (clean) - process_file_option (argv[optind], &file, &stream); + if (clean || clean_all) + process_file_arg (argv[optind], &file, &stream); else - process_options (arg_cnt, &argv[optind], &bold, colors, &file, &stream); - read_print_stream (bold, colors, file, stream, mode); + process_args (arg_cnt, &argv[optind], &bold, colors, &file, &stream); + read_print_stream (bold, colors, file, stream); RELEASE_VAR (exclude); exit (EXIT_SUCCESS); } +#define SET_OPT_TYPE(type) \ + opt_type = type; \ + opt = 0; \ + 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: + switch (opt) + { + case 0: /* long opts */ + switch (opt_type) + { + case OPT_CLEAN: + clean = true; + break; + case OPT_CLEAN_ALL: + clean_all = true; + break; + case OPT_EXCLUDE_RANDOM: { + bool valid = false; + unsigned int i; + exclude = xstrdup (optarg); + STACK_VAR (exclude); + for (i = 1; i < tables[FOREGROUND].count - 1; i++) /* skip color none and default */ + { + const struct color *entry = &tables[FOREGROUND].entries[i]; + if (streq (exclude, entry->name)) + { + valid = true; + break; + } + } + if (!valid) + vfprintf_fail (formats[FMT_GENERIC], "--exclude-random switch must be provided a plain color"); + break; + } + case OPT_HELP: + print_help (); + exit (EXIT_SUCCESS); + case OPT_VERSION: + print_version (); + exit (EXIT_SUCCESS); + default: /* never reached */ + ABORT_TRACE (); + } + break; + case 'h': + SET_OPT_TYPE (OPT_HELP); + case 'V': + SET_OPT_TYPE (OPT_VERSION); + case '?': + print_hint (); + exit (EXIT_FAILURE); + default: /* never reached */ + ABORT_TRACE (); + } + } +} + +static void +print_hint (void) +{ + fprintf (stderr, "Type `%s --help' for help screen.\n", program_name); +} + static void print_help (void) { unsigned int i; - printf ("Usage: %s (foreground) OR (foreground)%c(background) OR --clean [-|file]\n\n", program_name, COLOR_SEP_CHAR); + printf ("Usage: %s (foreground) OR (foreground)%c(background) OR --clean[-all] [-|file]\n\n", program_name, COLOR_SEP_CHAR); printf ("\tColors (foreground) (background)\n"); for (i = 0; i < tables[FOREGROUND].count; i++) { @@ -321,23 +431,50 @@ print_help (void) 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"); + printf ("\t\t-V, --version\n\n"); } static void print_version (void) { +#ifdef HAVE_VERSION +# include "version.h" +#else + const char *version = NULL; +#endif + const char *version_prefix, *version_string; const char *c_flags; - printf ("%s v%s (compiled at %s, %s)\n", "colorize", VERSION, __DATE__, __TIME__); + struct bytes_size bytes_size; + bool debug; #ifdef CFLAGS c_flags = to_str (CFLAGS); #else c_flags = "unknown"; #endif +#if DEBUG + debug = true; +#else + debug = false; +#endif + version_prefix = version ? "" : "v"; + version_string = version ? version : VERSION; + printf ("colorize %s%s (compiled at %s, %s)\n", version_prefix, version_string, __DATE__, __TIME__); + printf ("Compiler flags: %s\n", c_flags); - printf ("Buffer size: %u bytes\n", BUF_SIZE - 1); + if (get_bytes_size (BUF_SIZE, &bytes_size)) + { + if (BUF_SIZE % 1024 == 0) + printf ("Buffer size: %u%c\n", bytes_size.size, bytes_size.unit); + else + printf ("Buffer size: %u%c, %u byte%s\n", bytes_size.size, bytes_size.unit, + BUF_SIZE % 1024, BUF_SIZE % 1024 > 1 ? "s" : ""); + } + else + printf ("Buffer size: %lu byte%s\n", (unsigned long)BUF_SIZE, BUF_SIZE > 1 ? "s" : ""); + printf ("Debugging: %s\n", debug ? "yes" : "no"); } static void @@ -347,13 +484,17 @@ cleanup (void) if (stream && fileno (stream) != STDIN_FILENO) fclose (stream); +#if DEBUG + if (log) + fclose (log); +#endif if (vars_list) { unsigned int i; for (i = 0; i < stacked_vars; i++) if (vars_list[i]) - free_null (vars_list[i]); + free (vars_list[i]); free_null (vars_list); } @@ -365,22 +506,22 @@ free_color_names (struct color_name **color_names) unsigned int i; for (i = 0; color_names[i]; i++) { - free_null (color_names[i]->name); - free_null (color_names[i]->orig); + free (color_names[i]->name); + free (color_names[i]->orig); free_null (color_names[i]); } } static void -process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const struct color **colors, const char **file, FILE **stream) +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; struct stat sb; - const char *color_string = arg_cnt >= 1 ? option_strings[0] : NULL; - const char *file_string = arg_cnt == 2 ? option_strings[1] : NULL; + const char *color_string = arg_cnt >= 1 ? arg_strings[0] : NULL; + const char *file_string = arg_cnt == 2 ? arg_strings[1] : NULL; assert (color_string); @@ -392,15 +533,16 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const vfprintf_fail (formats[FMT_GENERIC], "hyphen must be preceeded by color string"); } - ret = stat (color_string, &sb); + ret = lstat (color_string, &sb); /* Ensure that we don't fail if there's a file with one or more color names in its path. */ - if (ret != -1) + 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++) { @@ -409,14 +551,18 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const for (i = 0; i < tables[FOREGROUND].count; i++) { const struct color *entry = &tables[FOREGROUND].entries[i]; - char *p; - if ((p = strstr (color, entry->name)) && p == color) + if (has_color_name (color, entry->name)) { - color = p + strlen (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 @@ -427,21 +573,27 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const if (have_file) { + const char *file_exists = color_string; if (file_string) - vfprintf_fail (formats[FMT_GENERIC], "file cannot be used as color string"); + vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "cannot be used as color string"); else - vfprintf_fail (formats[FMT_GENERIC], "file must be preceeded by color string"); + { + 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"); + } } } if ((p = strchr (color_string, COLOR_SEP_CHAR))) { if (p == color_string) - vfprintf_fail (formats[FMT_GENERIC], "foreground color missing"); + vfprintf_fail (formats[FMT_STRING], "foreground color missing in string", color_string); else if (p == color_string + strlen (color_string) - 1) - vfprintf_fail (formats[FMT_GENERIC], "background color missing"); + vfprintf_fail (formats[FMT_STRING], "background color missing in string", color_string); else if (strchr (++p, COLOR_SEP_CHAR)) - vfprintf_fail (formats[FMT_GENERIC], "one color pair allowed only"); + vfprintf_fail (formats[FMT_STRING], "one color pair allowed only for string", color_string); } str = xstrdup (color_string); @@ -450,6 +602,8 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const for (index = 0, color = str; *color; index++, color = p) { char *ch, *sep; + + p = NULL; if ((sep = strchr (color, COLOR_SEP_CHAR))) { *sep = '\0'; @@ -457,6 +611,7 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const } else p = color + strlen (color); + assert (p); for (ch = color; *ch; ch++) if (!isalpha (*ch)) @@ -478,13 +633,12 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const break; case BACKGROUND: vfprintf_fail (formats[FMT_COLOR], tables[BACKGROUND].desc, color, "cannot be bold"); - break; default: /* never reached */ ABORT_TRACE (); } } - color_names[index] = xmalloc (sizeof (struct color_name)); + color_names[index] = xcalloc (1, sizeof (struct color_name)); color_names[index]->orig = xstrdup (color); @@ -501,11 +655,11 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const if (color_names[BACKGROUND]) { unsigned int i; - unsigned int color_sets[2][2] = { { FOREGROUND, BACKGROUND }, { BACKGROUND, FOREGROUND } }; + const unsigned int color_sets[2][2] = { { FOREGROUND, BACKGROUND }, { BACKGROUND, FOREGROUND } }; for (i = 0; i < 2; i++) { - unsigned int color1 = color_sets[i][0]; - unsigned int color2 = color_sets[i][1]; + const unsigned int color1 = color_sets[i][0]; + const unsigned int color2 = color_sets[i][1]; if (CHECK_COLORS_RANDOM (color1, color2)) vfprintf_fail (formats[FMT_RANDOM], tables[color1].desc, color_names[color1]->orig, "cannot be combined with", color_names[color2]->orig); } @@ -515,13 +669,18 @@ process_options (unsigned int arg_cnt, char **option_strings, bool *bold, const free_color_names (color_names); if (!colors[FOREGROUND]->code && colors[BACKGROUND] && colors[BACKGROUND]->code) - find_color_entry ("default", FOREGROUND, colors); + { + struct color_name color_name; + color_name.name = color_name.orig = "default"; + + find_color_entry (&color_name, FOREGROUND, colors); + } - process_file_option (file_string, file, stream); + process_file_arg (file_string, file, stream); } static void -process_file_option (const char *file_string, const char **file, FILE **stream) +process_file_arg (const char *file_string, const char **file, FILE **stream) { if (file_string) { @@ -529,10 +688,9 @@ process_file_option (const char *file_string, const char **file, FILE **stream) *stream = stdin; else { - FILE *s; const char *file = file_string; struct stat sb; - int errno, ret; + int ret; errno = 0; ret = stat (file, &sb); @@ -540,15 +698,10 @@ process_file_option (const char *file_string, const char **file, FILE **stream) if (ret == -1) vfprintf_fail (formats[FMT_FILE], file, strerror (errno)); - if (!(S_ISREG (sb.st_mode) || S_ISLNK (sb.st_mode) || S_ISFIFO (sb.st_mode))) - vfprintf_fail (formats[FMT_FILE], file, "unrecognized file type"); - - errno = 0; + if (!VALID_FILE_TYPE (sb.st_mode)) + vfprintf_fail (formats[FMT_TYPE], file, "unrecognized type", get_file_type (sb.st_mode)); - s = fopen (file, "r"); - if (!s) - vfprintf_fail (formats[FMT_FILE], file, strerror (errno)); - *stream = s; + *stream = open_file (file, "r"); } *file = file_string; } @@ -559,113 +712,188 @@ process_file_option (const char *file_string, const char **file, FILE **stream) } assert (*stream); + assert (*file); } -#define MERGE_PRINT_LINE(part_line, line, flags, check_eof) do { \ - char *current_line, *merged_line = NULL; \ - if (part_line) \ - { \ - merged_line = str_concat (part_line, line); \ - free_null (part_line); \ - } \ - current_line = merged_line ? merged_line : (char *)line; \ - if (!check_eof || *current_line != '\0') \ - print_line (colors, bold, current_line, flags); \ - free (merged_line); \ -} while (false); - static void -read_print_stream (bool bold, const struct color **colors, const char *file, FILE *stream, enum stream_mode mode) +read_print_stream (bool bold, const struct color **colors, const char *file, FILE *stream) { - char buf[BUF_SIZE], *part_line = NULL; + char buf[BUF_SIZE + 1]; unsigned int flags = 0; - bool first = false, always = false; - - switch (mode) - { - case SCAN_FIRST: - first = true; - break; - case SCAN_ALWAYS: - always = true; - break; - default: /* never reached */ - ABORT_TRACE (); - } while (!feof (stream)) { size_t bytes_read; char *eol; const char *line; - memset (buf, '\0', BUF_SIZE); - bytes_read = fread (buf, 1, BUF_SIZE - 1, stream); - if (bytes_read != (BUF_SIZE - 1) && ferror (stream)) - vfprintf_fail (formats[FMT_ERROR], BUF_SIZE - 1, "read"); + 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"); line = buf; - LOOP: while ((eol = strpbrk (line, "\n\r"))) + while ((eol = strpbrk (line, "\n\r"))) { char *p; - if (first || always) + flags &= ~(CR|LF); + if (*eol == '\r') { - first = false; - flags &= ~(CR|LF); - if (*eol == '\r') - { - flags |= CR; - if (*(eol + 1) == '\n') - flags |= LF; - } - else if (*eol == '\n') + flags |= CR; + if (*(eol + 1) == '\n') flags |= LF; - else - vfprintf_fail (formats[FMT_FILE], file, "unrecognized line ending"); - } - if (always) - p = eol + SKIP_LINE_ENDINGS (flags); - else /* first */ - { - unsigned int i; - unsigned int count = sizeof (endings) / sizeof (struct ending); - for (i = 0; i < count; i++) - { - if (flags & endings[i].flags) - { - char *p; - if ((p = strstr (eol, endings[i].newline)) && p == eol) - break; - else - { - always = true; - goto LOOP; - } - } - } - p = eol + SKIP_LINE_ENDINGS (flags); } + else if (*eol == '\n') + flags |= LF; + else + vfprintf_fail (formats[FMT_FILE], file, "unrecognized line ending"); + p = eol + SKIP_LINE_ENDINGS (flags); *eol = '\0'; - MERGE_PRINT_LINE (part_line, line, flags, false); + print_line (bold, colors, line, flags); line = p; } - if (feof (stream)) { - MERGE_PRINT_LINE (part_line, line, 0, true); - } - else + if (feof (stream)) + { + if (*line != '\0') + print_line (bold, colors, line, 0); + } + else if (*line != '\0') { - if (!clean) /* efficiency */ - print_line (colors, bold, line, 0); - else if (!part_line) - part_line = xstrdup (line); + char *p; + if ((clean || clean_all) && (p = strrchr (line, '\033'))) + merge_print_line (bold, colors, line, p, stream); else - { - char *merged_line = str_concat (part_line, line); - free (part_line); - part_line = merged_line; - } + print_line (bold, colors, line, 0); } } } +static void +merge_print_line (bool bold, const struct color **colors, const char *line, const char *p, FILE *stream) +{ + char *buf = NULL; + char *merged_part_line = NULL; + const char *part_line; + + complete_part_line (p + 1, &buf, stream); + + if (buf) + part_line = merged_part_line = str_concat (line, buf); + else + part_line = line; + free (buf); + +#ifdef TEST_MERGE_PART_LINE + printf ("%s", part_line); + free (merged_part_line); + exit (EXIT_SUCCESS); +#else + print_line (bold, colors, part_line, 0); + free (merged_part_line); +#endif +} + +static void +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; + + if (get_next_char (&ch, &p, stream, &read_from_stream)) + { + if (ch == '[') + { + if (read_from_stream) + save_char (ch, buf, &i, &size); + } + else + { + if (read_from_stream) + ungetc ((int)ch, stream); + return; /* cancel */ + } + } + else + return; /* cancel */ + + while (get_next_char (&ch, &p, stream, &read_from_stream)) + { + if (isdigit (ch) || ch == ';') + { + if (read_from_stream) + save_char (ch, buf, &i, &size); + } + else /* read next character */ + { + got_next_char = true; + break; + } + } + + if (got_next_char) + { + if (ch == 'm') + { + if (read_from_stream) + save_char (ch, buf, &i, &size); + } + else + { + if (read_from_stream) + ungetc ((int)ch, stream); + return; /* cancel */ + } + } + else + return; /* cancel */ +} + +static bool +get_next_char (char *ch, const char **p, FILE *stream, bool *read_from_stream) +{ + if (**p == '\0') + { + int c; + if ((c = fgetc (stream)) != EOF) + { + *ch = (char)c; + *read_from_stream = true; + return true; + } + else + { + *read_from_stream = false; + return false; + } + } + else + { + *ch = **p; + (*p)++; + *read_from_stream = false; + return true; + } +} + +static void +save_char (char ch, char **buf, unsigned long *i, size_t *size) +{ + 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)++; +} + static void find_color_entries (struct color_name **color_names, const struct color **colors) { @@ -710,12 +938,12 @@ find_color_entries (struct color_name **color_names, const struct color **colors colors[index] = (struct color *)&color_entries[i]; } else - find_color_entry (color_name, index, colors); + find_color_entry (color_names[index], index, colors); } } static void -find_color_entry (const char *const color_name, unsigned int index, const struct color **colors) +find_color_entry (const struct color_name *color_name, unsigned int index, const struct color **colors) { bool found = false; unsigned int i; @@ -724,24 +952,25 @@ find_color_entry (const char *const color_name, unsigned int index, const struct const struct color *const color_entries = tables[index].entries; for (i = 0; i < count; i++) - if (streq (color_name, color_entries[i].name)) + if (streq (color_name->name, color_entries[i].name)) { colors[index] = (struct color *)&color_entries[i]; found = true; break; } if (!found) - vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color_name, "not recognized"); + vfprintf_fail (formats[FMT_COLOR], tables[index].desc, color_name->orig, "not recognized"); } static void -print_line (const struct color **colors, bool bold, const char *const line, unsigned int flags) +print_line (bool bold, const struct color **colors, const char *const line, unsigned int flags) { - /* --clean */ - if (clean) + /* --clean[-all] */ + if (clean || clean_all) print_clean (line); else { + /* Foreground color code is guaranteed to be set when background color code is present. */ if (colors[BACKGROUND] && colors[BACKGROUND]->code) printf ("\033[%s", colors[BACKGROUND]->code); if (colors[FOREGROUND]->code) @@ -758,30 +987,89 @@ print_line (const struct color **colors, bool bold, const char *const line, unsi static void print_clean (const char *line) { - const char *p; - char ***offsets = NULL; - unsigned int count = 0, i = 0; + const char *p = line; - for (p = line; *p;) + if (is_esc (p)) + p = get_end_of_esc (p); + + while (*p != '\0') + { + const char *text_start = p; + const char *text_end = get_end_of_text (p); + print_text (text_start, text_end - text_start); + p = get_end_of_esc (text_end); + } +} + +static bool +is_esc (const char *p) +{ + return gather_esc_offsets (p, NULL, NULL); +} + +static const char * +get_end_of_esc (const char *p) +{ + const char *esc; + const char *end = NULL; + while ((esc = strchr (p, '\033'))) { - /* ESC[ */ - if (*p == 27 && *(p + 1) == '[') + if (gather_esc_offsets (esc, NULL, &end)) + break; + p = esc + 1; + } + return end ? end + 1 : p + strlen (p); +} + +static const char * +get_end_of_text (const char *p) +{ + const char *esc; + const char *start = NULL; + while ((esc = strchr (p, '\033'))) + { + if (gather_esc_offsets (esc, &start, NULL)) + break; + p = esc + 1; + } + return start ? start : p + strlen (p); +} + +static void +print_text (const char *p, size_t len) +{ + size_t bytes_written; + bytes_written = fwrite (p, 1, len, stdout); + if (bytes_written != len) + vfprintf_fail (formats[FMT_ERROR], (unsigned long)len, "written"); +} + +static bool +gather_esc_offsets (const char *p, const char **start, const char **end) +{ + /* ESC[ */ + if (*p == 27 && *(p + 1) == '[') + { + bool valid = false; + const char *begin = p; + p += 2; + if (clean_all) + valid = validate_esc_clean_all (&p); + else if (clean) { - bool check_values, first = true; - const char *begin = p; - p += 2; - if (!isdigit (*p)) - goto END; + bool check_values; + unsigned int iter = 0; + const char *digit; do { - const char *digit; check_values = false; - if (!first && !isdigit (*p)) - goto DISCARD; + iter++; + if (!isdigit (*p)) + break; digit = p; while (isdigit (*p)) p++; if (p - digit > 2) - goto DISCARD; + break; else /* check range */ { char val[3]; @@ -792,79 +1080,74 @@ print_clean (const char *line) val[i] = *digit++; val[i] = '\0'; value = atoi (val); - if (!((value >= 0 && value <= 8) /* attributes */ - || (value >= 30 && value <= 37) /* foreground colors */ - || (value >= 40 && value <= 47) /* background colors */ - || (value == 39 || value == 49))) /* default colors */ - goto DISCARD; - } - if (*p == ';') - { - p++; - check_values = true; + valid = validate_esc_clean (value, iter, &p, &check_values); } - first = false; } while (check_values); - END: if (*p == 'm') - { - const char *end = p++; - if (!offsets) - offsets = xmalloc (++count * sizeof (char **)); - else - offsets = xrealloc (offsets, ++count * sizeof (char **)); - offsets[i] = xmalloc (2 * sizeof (char *)); - offsets[i][0] = (char *)begin; /* ESC */ - offsets[i][1] = (char *)end; /* m */ - i++; - continue; - } - DISCARD: - continue; } - p++; + if (valid) + { + if (start) + *start = begin; + if (end) + *end = p; + return true; + } } + return false; +} - if (offsets) - print_free_offsets (line, offsets, count); - else - printf (formats[FMT_GENERIC], line); +static bool +validate_esc_clean_all (const char **p) +{ + while (isdigit (**p) || **p == ';') + (*p)++; + return (**p == 'm'); } -#define SET_CHAR(offset, new, old) \ - *old = *offset; \ - *offset = new; \ +static bool +validate_esc_clean (int value, unsigned int iter, const char **p, bool *check_values) +{ + if (is_reset (value, iter, p)) + return true; + else if (is_bold (value, iter, p)) + { + (*p)++; + *check_values = true; + return false; /* partial escape sequence, need another valid value */ + } + else if (is_fg_color (value, p)) + return true; + else if (is_bg_color (value, iter, p)) + return true; + else + return false; +} -#define RESTORE_CHAR(offset, old) \ - *offset = old; \ +static bool +is_reset (int value, unsigned int iter, const char **p) +{ + return (value == 0 && iter == 1 && **p == 'm'); +} -static void -print_free_offsets (const char *line, char ***offsets, unsigned int count) +static bool +is_bold (int value, unsigned int iter, const char **p) { - char ch; - unsigned int i; + return (value == 1 && iter == 1 && **p == ';'); +} - SET_CHAR (offsets[0][0], '\0', &ch); - printf (formats[FMT_GENERIC], line); - RESTORE_CHAR (offsets[0][0], ch); +static bool +is_fg_color (int value, const char **p) +{ + return (((value >= 30 && value <= 37) || value == 39) && **p == 'm'); +} - for (i = 0; i < count; i++) - { - char ch; - bool next_offset = false; - if (i + 1 < count) - { - SET_CHAR (offsets[i + 1][0], '\0', &ch); - next_offset = true; - } - printf (formats[FMT_GENERIC], offsets[i][1] + 1); - if (next_offset) - RESTORE_CHAR (offsets[i + 1][0], ch); - } - for (i = 0; i < count; i++) - free_null (offsets[i]); - free_null (offsets); +static bool +is_bg_color (int value, unsigned int iter, const char **p) +{ + return (((value >= 40 && value <= 47) || value == 49) && iter == 1 && **p == 'm'); } +#if !DEBUG static void * malloc_wrap (size_t size) { @@ -874,6 +1157,15 @@ malloc_wrap (size_t size) return p; } +static void * +calloc_wrap (size_t nmemb, size_t size) +{ + void *p = calloc (nmemb, size); + if (!p) + MEM_ALLOC_FAIL (); + return p; +} + static void * realloc_wrap (void *ptr, size_t size) { @@ -882,13 +1174,24 @@ realloc_wrap (void *ptr, size_t size) MEM_ALLOC_FAIL (); return p; } - +#else static void * malloc_wrap_debug (size_t size, const char *file, unsigned int line) { void *p = malloc (size); if (!p) MEM_ALLOC_FAIL_DEBUG (file, line); + fprintf (log, "%s: malloc'ed %lu bytes [source file %s, line %u]\n", program_name, (unsigned long)size, file, line); + return p; +} + +static void * +calloc_wrap_debug (size_t nmemb, size_t size, const char *file, unsigned int line) +{ + void *p = calloc (nmemb, size); + if (!p) + MEM_ALLOC_FAIL_DEBUG (file, line); + fprintf (log, "%s: calloc'ed %lu bytes [source file %s, line %u]\n", program_name, (unsigned long)(nmemb * size), file, line); return p; } @@ -898,8 +1201,10 @@ realloc_wrap_debug (void *ptr, size_t size, const char *file, unsigned int line) void *p = realloc (ptr, size); if (!p) MEM_ALLOC_FAIL_DEBUG (file, line); + fprintf (log, "%s: realloc'ed %lu bytes [source file %s, line %u]\n", program_name, (unsigned long)size, file, line); return p; } +#endif /* !DEBUG */ static void free_wrap (void **ptr) @@ -908,22 +1213,28 @@ free_wrap (void **ptr) *ptr = NULL; } +#if !DEBUG +# define do_malloc(len, file, line) malloc_wrap(len) +#else +# define do_malloc(len, file, line) malloc_wrap_debug(len, file, line) +#endif + static char * -strdup_wrap (const char *str) +strdup_wrap (const char *str, const char *file, unsigned int line) { const size_t len = strlen (str) + 1; - char *p = xmalloc (len); + char *p = do_malloc (len, file, line); strncpy (p, str, len); return p; } static char * -str_concat (const char *str1, const char *str2) +str_concat_wrap (const char *str1, const char *str2, const char *file, unsigned int line) { const size_t len = strlen (str1) + strlen (str2) + 1; char *p, *str; - p = str = xmalloc (len); + p = str = do_malloc (len, file, line); strncpy (p, str1, strlen (str1)); p += strlen (str1); strncpy (p, str2, strlen (str2)); @@ -933,15 +1244,93 @@ str_concat (const char *str1, const char *str2) return str; } +static bool +get_bytes_size (unsigned long bytes, struct bytes_size *bytes_size) +{ + const char *unit, units[] = { '0', 'K', 'M', 'G', '\0' }; + unsigned long size = bytes; + if (bytes < 1024) + return false; + unit = units; + while (size >= 1024 && *(unit + 1)) + { + size /= 1024; + unit++; + } + bytes_size->size = (unsigned int)size; + bytes_size->unit = *unit; + return true; +} + +static char * +get_file_type (mode_t mode) +{ + if (S_ISREG (mode)) + return "file"; + else if (S_ISDIR (mode)) + return "directory"; + else if (S_ISCHR (mode)) + return "character device"; + else if (S_ISBLK (mode)) + return "block device"; + else if (S_ISFIFO (mode)) + return "named pipe"; + else if (S_ISLNK (mode)) + return "symbolic link"; + else if (S_ISSOCK (mode)) + return "socket"; + else + return "file"; +} + +static bool +has_color_name (const char *str, const char *name) +{ + char *p; + + assert (strlen (str)); + assert (strlen (name)); + + if (!(*str == *name || *str == toupper (*name))) + return false; + else if (*(name + 1) != '\0' + && !((p = strstr (str + 1, name + 1)) && p == str + 1)) + return false; + + return true; +} + +static FILE * +open_file (const char *file, const char *mode) +{ + FILE *stream; + + errno = 0; + stream = fopen (file, mode); + if (!stream) + vfprintf_fail (formats[FMT_FILE], file, strerror (errno)); + + return stream; +} + +#define DO_VFPRINTF(fmt) \ + va_list ap; \ + fprintf (stderr, "%s: ", program_name); \ + va_start (ap, fmt); \ + vfprintf (stderr, fmt, ap); \ + va_end (ap); \ + fprintf (stderr, "\n"); \ + +static void +vfprintf_diag (const char *fmt, ...) +{ + DO_VFPRINTF (fmt); +} + static void vfprintf_fail (const char *fmt, ...) { - va_list ap; - fprintf (stderr, "%s: ", program_name); - va_start (ap, fmt); - vfprintf (stderr, fmt, ap); - va_end (ap); - fprintf (stderr, "\n"); + DO_VFPRINTF (fmt); exit (EXIT_FAILURE); }