#define streq(s1, s2) (strcmp (s1, s2) == 0)
-#define xmalloc(size) malloc_wrap(size, __FILE__, __LINE__)
-#define xrealloc(ptr, size) realloc_wrap(ptr, size, __FILE__, __LINE__)
-#define free_null(ptr) free_wrap((void **)&ptr )
-#define xstrdup(str) strdup_wrap(str, __FILE__, __LINE__)
+#if DEBUG
+# define xmalloc(size) malloc_wrap_debug(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)
+#endif
+
+#define free_null(ptr) free_wrap((void **)&ptr)
+#define xstrdup(str) strdup_wrap(str)
#if !defined BUF_SIZE || BUF_SIZE <= 0
# undef BUF_SIZE
release_var (vars_list, stacked_vars, (void **)&ptr); \
} while (false);
-#if DEBUG
-# define MEM_ALLOC_FAIL(file, line) do { \
- fprintf (stderr, "Memory allocation failure in source file %s, line %d\n", file, line); \
+#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);
-#else
-# define MEM_ALLOC_FAIL(file, line) do { \
+#define MEM_ALLOC_FAIL() do { \
fprintf (stderr, "%s: memory allocation failure\n", program_name); \
exit (2); \
} while (false);
-#endif
#define ABORT_TRACE() \
- fprintf (stderr, "Aborting in source file %s, line %d\n", __FILE__, __LINE__); \
+ fprintf (stderr, "Aborting in source file %s, line %u\n", __FILE__, __LINE__); \
abort (); \
#define CHECK_COLORS_RANDOM(color1, color2) \
&& (streq (color_names[color2]->name, "none") \
|| streq (color_names[color2]->name, "default")) \
-#define VERSION "0.48"
+#define COLOR_SEP_CHAR '/'
+
+#define VERSION "0.50"
typedef unsigned short bool;
"%s", /* generic */
"%s color '%s' %s", /* color */
"%s color '%s' %s '%s'", /* random */
- "less than %d bytes %s", /* error */
+ "less than %u bytes %s", /* error */
"%s: %s", /* file */
};
static void **vars_list = NULL;
static bool clean = false;
+static bool clean_all = false;
+
static char *exclude = NULL;
static const char *program_name;
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, const char *, unsigned int);
-static void *realloc_wrap (void *, size_t, const char *, unsigned int);
+static void *malloc_wrap (size_t);
+static void *realloc_wrap (void *, size_t);
+static void *malloc_wrap_debug (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 *, const char *, unsigned int);
+static char *strdup_wrap (const char *);
static char *str_concat (const char *, 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 **);
+#define SET_OPT_TYPE(type) \
+ opt_type = type; \
+ opt = 0; \
+ goto PARSE_OPT; \
+
extern char *optarg;
extern int optind;
{
unsigned int arg_cnt = 0;
- int opt;
+ enum {
+ OPT_CLEAN = 1,
+ OPT_CLEAN_ALL,
+ OPT_EXCLUDE_RANDOM,
+ OPT_HELP,
+ OPT_VERSION
+ };
+
+ int opt, opt_type = 0;
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 },
+ { "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 },
+ { 0, 0, 0, 0 },
};
bool bold = false;
while ((opt = getopt_long (argc, argv, "hv", long_opts, NULL)) != -1)
{
+ PARSE_OPT:
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");
+ 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: {
+ 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 OPT_HELP:
+ print_help ();
+ exit (EXIT_SUCCESS);
+ case OPT_VERSION:
+ print_version ();
+ exit (EXIT_SUCCESS);
+ default: /* never reached */
+ ABORT_TRACE ();
+ }
break;
- }
case 'h':
- print_help ();
- exit (EXIT_SUCCESS);
+ SET_OPT_TYPE (OPT_HELP);
case 'v':
- print_version ();
- exit (EXIT_SUCCESS);
+ SET_OPT_TYPE (OPT_VERSION);
case '?':
print_help ();
exit (EXIT_FAILURE);
arg_cnt = argc - optind;
- if (clean)
+ if (clean || clean_all)
{
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 (clean)
+ if (clean || clean_all)
process_file_option (argv[optind], &file, &stream);
else
process_options (arg_cnt, &argv[optind], &bold, colors, &file, &stream);
{
unsigned int i;
- printf ("Usage: %s (foreground) OR (foreground)/(background) OR --clean [-|file]\n\n", program_name);
+ 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++)
{
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");
c_flags = "unknown";
#endif
printf ("Compiler flags: %s\n", c_flags);
- printf ("Buffer size: %d bytes\n", BUF_SIZE - 1);
+ printf ("Buffer size: %u bytes\n", BUF_SIZE - 1);
}
static void
for (i = 0; i < stacked_vars; i++)
if (vars_list[i])
free_null (vars_list[i]);
+
free_null (vars_list);
}
}
break;
}
}
- if (matched && *color == '/' && *(color + 1))
+ if (matched && *color == COLOR_SEP_CHAR && *(color + 1))
color++;
else
break;
}
}
- if ((p = strchr (color_string, '/')))
+ if ((p = strchr (color_string, COLOR_SEP_CHAR)))
{
if (p == color_string)
vfprintf_fail (formats[FMT_GENERIC], "foreground color missing");
else if (p == color_string + strlen (color_string) - 1)
vfprintf_fail (formats[FMT_GENERIC], "background color missing");
- else if (strchr (++p, '/'))
+ else if (strchr (++p, COLOR_SEP_CHAR))
vfprintf_fail (formats[FMT_GENERIC], "one color pair allowed only");
}
for (index = 0, color = str; *color; index++, color = p)
{
char *ch, *sep;
- if ((sep = strchr (color, '/')))
+ if ((sep = strchr (color, COLOR_SEP_CHAR)))
{
*sep = '\0';
p = sep + 1;
assert (*stream);
}
-#define MERGE_PRINT_LINE(part_line, line, flags) do { \
- char *merged_line = NULL; \
- if (part_line) \
- { \
- merged_line = str_concat (part_line, line); \
- free_null (part_line); \
- } \
- print_line (colors, bold, merged_line ? merged_line : line, flags); \
- free (merged_line); \
+#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
p = eol + SKIP_LINE_ENDINGS (flags);
}
*eol = '\0';
- MERGE_PRINT_LINE (part_line, line, flags);
+ MERGE_PRINT_LINE (part_line, line, flags, false);
line = p;
}
if (feof (stream)) {
- MERGE_PRINT_LINE (part_line, line, 0);
+ MERGE_PRINT_LINE (part_line, line, 0, true);
}
else
{
- if (!clean) /* efficiency */
+ if (!clean && !clean_all) /* efficiency */
print_line (colors, bold, line, 0);
else if (!part_line)
part_line = xstrdup (line);
static void
print_line (const struct color **colors, bool bold, const char *const line, unsigned int flags)
{
- /* --clean */
- if (clean)
+ /* --clean[-all] */
+ if (clean || clean_all)
print_clean (line);
else
{
/* ESC[ */
if (*p == 27 && *(p + 1) == '[')
{
- bool check_values, first = true;
const char *begin = p;
p += 2;
- if (!isdigit (*p))
- goto END;
- do {
- const char *digit;
- check_values = false;
- if (!first && !isdigit (*p))
- goto DISCARD;
- digit = p;
- while (isdigit (*p))
- p++;
- if (p - digit > 2)
- goto DISCARD;
- else /* check range */
- {
- char val[3];
- int value;
- unsigned int i;
- const unsigned int digits = p - digit;
- for (i = 0; i < digits; i++)
- 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 == ';')
- {
+ if (clean_all)
+ {
+ while (isdigit (*p) || *p == ';')
p++;
- check_values = true;
- }
- first = false;
- } while (check_values);
+ }
+ else if (clean)
+ {
+ bool check_values, first = true;
+ if (!isdigit (*p))
+ goto END;
+ do {
+ const char *digit;
+ check_values = false;
+ if (!first && !isdigit (*p))
+ goto DISCARD;
+ digit = p;
+ while (isdigit (*p))
+ p++;
+ if (p - digit > 2)
+ goto DISCARD;
+ else /* check range */
+ {
+ char val[3];
+ int value;
+ unsigned int i;
+ const unsigned int digits = p - digit;
+ for (i = 0; i < digits; i++)
+ 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 */
+ goto DISCARD;
+ }
+ if (*p == ';')
+ {
+ p++;
+ check_values = true;
+ }
+ first = false;
+ } while (check_values);
+ }
END: if (*p == 'm')
{
- const char *end = p;
+ const char *end = p++;
if (!offsets)
offsets = xmalloc (++count * sizeof (char **));
else
offsets[i][0] = (char *)begin; /* ESC */
offsets[i][1] = (char *)end; /* m */
i++;
+ continue;
}
DISCARD:
continue;
}
static void *
-malloc_wrap (size_t size, const char *file, unsigned int line)
+malloc_wrap (size_t size)
+{
+ void *p = malloc (size);
+ if (!p)
+ MEM_ALLOC_FAIL ();
+ return p;
+}
+
+static void *
+realloc_wrap (void *ptr, size_t size)
+{
+ void *p = realloc (ptr, size);
+ if (!p)
+ MEM_ALLOC_FAIL ();
+ return p;
+}
+
+static void *
+malloc_wrap_debug (size_t size, const char *file, unsigned int line)
{
void *p = malloc (size);
if (!p)
- MEM_ALLOC_FAIL (file, line);
+ MEM_ALLOC_FAIL_DEBUG (file, line);
return p;
}
static void *
-realloc_wrap (void *ptr, size_t size, const char *file, unsigned int line)
+realloc_wrap_debug (void *ptr, size_t size, const char *file, unsigned int line)
{
void *p = realloc (ptr, size);
if (!p)
- MEM_ALLOC_FAIL (file, line);
+ MEM_ALLOC_FAIL_DEBUG (file, line);
return p;
}
}
static char *
-strdup_wrap (const char *str, const char *file, unsigned int line)
+strdup_wrap (const char *str)
{
- const unsigned int len = strlen (str) + 1;
- char *p = malloc (len);
- if (!p)
- MEM_ALLOC_FAIL (file, line);
+ const size_t len = strlen (str) + 1;
+ char *p = xmalloc (len);
strncpy (p, str, len);
return p;
}
static char *
str_concat (const char *str1, const char *str2)
{
- const unsigned long len = strlen (str1) + strlen (str2) + 1;
+ const size_t len = strlen (str1) + strlen (str2) + 1;
char *p, *str;
p = str = xmalloc (len);
projects / colorize.git / blobdiff