X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=colorize.c;h=ca62d7db24c1bc1178859444995b9352c14e1d5f;hb=b5ce19453b1bff15e269130df1d132889ec74a10;hp=5f64ce762430c78add614cc1101aea4a1f7674dc;hpb=4c63e4c28c80a7b1528d67793585b499a4008be8;p=colorize.git diff --git a/colorize.c b/colorize.c index 5f64ce7..ca62d7d 100644 --- a/colorize.c +++ b/colorize.c @@ -116,7 +116,7 @@ #define DEBUG_FILE "debug.txt" -#define VERSION "0.58" +#define VERSION "0.59" typedef enum { false, true } bool; @@ -125,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; @@ -194,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; @@ -324,38 +339,22 @@ main (int argc, char **argv) exit (EXIT_SUCCESS); } -#define SET_OPT_TYPE(type) \ - opt_type = type; \ - opt = 0; \ - goto PARSE_OPT; \ +#define PRINT_HELP_EXIT() \ + print_help (); \ + exit (EXIT_SUCCESS); \ + +#define PRINT_VERSION_EXIT() \ + print_version (); \ + exit (EXIT_SUCCESS); \ 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 */ @@ -386,19 +385,17 @@ process_opts (int argc, char **argv) break; } case OPT_HELP: - print_help (); - exit (EXIT_SUCCESS); + PRINT_HELP_EXIT (); case OPT_VERSION: - print_version (); - exit (EXIT_SUCCESS); + PRINT_VERSION_EXIT (); default: /* never reached */ ABORT_TRACE (); } break; case 'h': - SET_OPT_TYPE (OPT_HELP); + PRINT_HELP_EXIT (); case 'V': - SET_OPT_TYPE (OPT_VERSION); + PRINT_VERSION_EXIT (); case '?': print_hint (); exit (EXIT_FAILURE); @@ -417,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); @@ -438,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 @@ -454,7 +473,7 @@ print_version (void) const char *version = NULL; #endif const char *version_prefix, *version_string; - const char *c_flags; + const char *c_flags, *ld_flags, *cpp_flags; struct bytes_size bytes_size; bool debug; #ifdef CFLAGS @@ -462,6 +481,16 @@ print_version (void) #else c_flags = "unknown"; #endif +#ifdef LDFLAGS + ld_flags = to_str (LDFLAGS); +#else + ld_flags = "unknown"; +#endif +#ifdef CPPFLAGS + cpp_flags = to_str (CPPFLAGS); +#else + cpp_flags = "unknown"; +#endif #if DEBUG debug = true; #else @@ -472,6 +501,8 @@ print_version (void) printf ("colorize %s%s (compiled at %s, %s)\n", version_prefix, version_string, __DATE__, __TIME__); printf ("Compiler flags: %s\n", c_flags); + printf ("Linker flags: %s\n", ld_flags); + printf ("Preprocessor flags: %s\n", cpp_flags); if (get_bytes_size (BUF_SIZE, &bytes_size)) { if (BUF_SIZE % 1024 == 0) @@ -489,8 +520,6 @@ print_version (void) static void cleanup (void) { - free_color_names (color_names); - if (stream && fileno (stream) != STDIN_FILENO) fclose (stream); #if DEBUG @@ -513,9 +542,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]); } } @@ -525,6 +554,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct int ret; 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; @@ -536,7 +566,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, bool *bold, const struct if (file_string) vfprintf_fail (formats[FMT_GENERIC], "hyphen cannot be used as color string"); else - vfprintf_fail (formats[FMT_GENERIC], "hyphen must be preceeded by color string"); + vfprintf_fail (formats[FMT_GENERIC], "hyphen must be preceded by color string"); } ret = lstat (color_string, &sb); @@ -666,7 +696,7 @@ skip_path_colors (const char *color_string, const char *file_string, const struc else { if (VALID_FILE_TYPE (mode)) - vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "must be preceeded by color string"); + vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "must be preceded by color string"); else vfprintf_fail (formats[FMT_QUOTE], get_file_type (mode), file_exists, "is not a valid file type"); } @@ -722,13 +752,16 @@ gather_color_names (const char *color_string, bool *bold, struct color_name **co } 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); @@ -752,7 +785,7 @@ read_print_stream (bool bold, const struct color **colors, const char *file, FIL line = buf; while ((eol = strpbrk (line, "\n\r"))) { - char *p; + const char *p; flags &= ~(CR|LF); if (*eol == '\r') {