#include <time.h>
#include <unistd.h>
-#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__)
+# 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__)
#else
-# define xmalloc(size) malloc_wrap(size)
-# define xrealloc(ptr, size) realloc_wrap(ptr, size)
+# define xmalloc(size) malloc_wrap(size)
+# define xcalloc(nmemb, size) calloc_wrap(nmemb, size)
+# define xrealloc(ptr, size) realloc_wrap(ptr, size)
#endif
#define free_null(ptr) free_wrap((void **)&ptr)
#define COLOR_SEP_CHAR '/'
-#define VERSION "0.49"
+#define VERSION "0.51"
typedef unsigned short bool;
{ 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 = NULL;
static unsigned int stacked_vars = 0;
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 read_print_stream (bool, const struct color **, const char *, FILE *);
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 find_color_entry (const struct color_name *, unsigned int, const struct color **);
static void print_line (const struct color **, bool, const char * const, unsigned int);
static void print_clean (const char *);
static void print_free_offsets (const char *, char ***, unsigned int);
static void *malloc_wrap (size_t);
+static void *calloc_wrap (size_t, size_t);
static void *realloc_wrap (void *, size_t);
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);
static void free_wrap (void **);
static char *strdup_wrap (const char *);
static char *str_concat (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 **);
const char *file;
- enum stream_mode mode = SCAN_FIRST;
-
program_name = argv[0];
atexit (cleanup);
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)
{
const char *format = "%s %s";
{
if (arg_cnt == 0 || arg_cnt > 2)
{
+ vfprintf_diag ("%u arguments provided, expected 1-2 arguments or option", arg_cnt);
print_help ();
exit (EXIT_FAILURE);
}
process_file_option (argv[optind], &file, &stream);
else
process_options (arg_cnt, &argv[optind], &bold, colors, &file, &stream);
- read_print_stream (bold, colors, file, stream, mode);
+ read_print_stream (bold, colors, file, stream);
RELEASE_VAR (exclude);
}
}
- color_names[index] = xmalloc (sizeof (struct color_name));
+ color_names[index] = xcalloc (1, sizeof (struct color_name));
color_names[index]->orig = xstrdup (color);
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);
}
} 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;
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))
{
if (bytes_read != (BUF_SIZE - 1) && ferror (stream))
vfprintf_fail (formats[FMT_ERROR], BUF_SIZE - 1, "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);
line = p;
if (feof (stream)) {
MERGE_PRINT_LINE (part_line, line, 0, true);
}
- else
+ else if (*line != '\0')
{
if (!clean && !clean_all) /* efficiency */
print_line (colors, bold, line, 0);
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;
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_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)
}
else if (clean)
{
- bool check_values, first = true;
- 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))
+ iter++;
+ if (!isdigit (*p))
goto DISCARD;
digit = p;
while (isdigit (*p))
val[i] = *digit++;
val[i] = '\0';
value = atoi (val);
- if (!((value == 0 || value == 1) /* attributes */
- || (value >= 30 && value <= 37) /* foreground colors */
- || (value >= 40 && value <= 47) /* background colors */
- || (value == 39 || value == 49))) /* default colors */
+ if (value == 0) /* reset */
+ {
+ if (iter > 1)
+ goto DISCARD;
+ goto END;
+ }
+ else if (value == 1) /* bold */
+ {
+ bool discard = false;
+ if (iter > 1)
+ discard = true;
+ else if (*p != ';')
+ discard = true;
+ if (discard)
+ goto DISCARD;
+ p++;
+ check_values = true;
+ }
+ else if ((value >= 30 && value <= 37) || value == 39) /* foreground colors */
+ goto END;
+ else if ((value >= 40 && value <= 47) || value == 49) /* background colors */
+ {
+ if (iter > 1)
+ goto DISCARD;
+ goto END;
+ }
+ else
goto DISCARD;
}
- if (*p == ';')
- {
- p++;
- check_values = true;
- }
- first = false;
- } while (check_values);
+ } while (iter == 1 && check_values);
}
END: if (*p == 'm')
{
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)
{
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);
+ return p;
+}
+
static void *
realloc_wrap_debug (void *ptr, size_t size, const char *file, unsigned int line)
{
return str;
}
+#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);
}
projects / colorize.git / blobdiff