* colorize - Read text from standard input stream or file and print
* it colorized through use of ANSI escape sequences
*
- * Copyright (c) 2011-2016 Steven Schubiger
+ * Copyright (c) 2011-2017 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
*
*/
+#define _DEFAULT_SOURCE
#define _BSD_SOURCE
#define _XOPEN_SOURCE 700
#define _FILE_OFFSET_BITS 64
#define DEBUG_FILE "debug.txt"
-#define VERSION "0.59"
+#define VERSION "0.60"
typedef enum { false, true } bool;
char *orig;
};
-static struct color_name *color_names[3] = { NULL, NULL, NULL };
-
struct color {
const char *name;
const char *code;
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;
int opt;
while ((opt = getopt_long (argc, argv, "hV", long_opts, NULL)) != -1)
{
- PARSE_OPT:
switch (opt)
{
case 0: /* long opts */
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);
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
#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
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)
static void
cleanup (void)
{
- free_color_names (color_names);
-
if (stream && fileno (stream) != STDIN_FILENO)
fclose (stream);
#if DEBUG
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]);
}
}
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;
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);
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");
}
}
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);
line = buf;
while ((eol = strpbrk (line, "\n\r")))
{
- char *p;
+ const char *p;
flags &= ~(CR|LF);
if (*eol == '\r')
{