#define LF 0x01
#define CR 0x02
-#define SKIP_LINE_ENDINGS(flags) (((flags) & CR) && ((flags) & LF) ? 2 : 1)
+#define SKIP_LINE_ENDINGS(flags) ((flags) == (CR|LF) ? 2 : 1)
#define VALID_FILE_TYPE(mode) (S_ISREG (mode) || S_ISLNK (mode) || S_ISFIFO (mode))
# define COLOR_SEP_CHAR '/'
#endif
-#define DEBUG_FILE "debug.txt"
+#if DEBUG
+# define DEBUG_FILE "debug.txt"
+#endif
-#define MAX_ATTRIBUTE_CHARS (5 * 2)
+#define MAX_ATTRIBUTE_CHARS (6 * 2)
-#define VERSION "0.61"
+#define VERSION "0.62"
typedef enum { false, true } bool;
char unit;
};
-enum fmts {
+enum {
FMT_GENERIC,
FMT_STRING,
FMT_QUOTE,
enum { GENERIC, FOREGROUND = 0, BACKGROUND };
static const struct {
- struct color const *entries;
+ const struct color *entries;
unsigned int count;
const char *desc;
} tables[] = {
}
if (!valid_attr)
{
- char *sep;
- char *attr_invalid = xstrdup (s);
+ char *attr_invalid = xmalloc ((p - s) + 1);
STACK_VAR (attr_invalid);
- if ((sep = strchr (attr_invalid, ',')))
- *sep = '\0';
+ strncpy (attr_invalid, s, p - s);
+ attr_invalid[p - s] = '\0';
vfprintf_fail ("--attr switch attribute '%s' is not valid", attr_invalid);
+ RELEASE_VAR (attr_invalid); /* never reached */
}
}
if (*p)
static void
print_help (void)
{
- struct short_opt {
+ struct opt_data {
const char *name;
const char *short_opt;
+ const char *arg;
};
- const struct short_opt short_opts[] = {
- { "help", "h" },
- { "version", "V" },
+ const struct opt_data opts_data[] = {
+ { "attr", NULL, "=ATTR1,ATTR2,..." },
+ { "exclude-random", NULL, "=COLOR" },
+ { "help", "h", NULL },
+ { "version", "V", NULL },
};
const struct option *opt = long_opts;
unsigned int i;
printf ("\n\tOptions\n");
for (; opt->name; opt++)
{
- const char *short_opt = NULL;
+ const struct opt_data *opt_data = NULL;
unsigned int i;
- for (i = 0; i < sizeof (short_opts) / sizeof (struct short_opt); i++)
+ for (i = 0; i < sizeof (opts_data) / sizeof (struct opt_data); i++)
+ if (streq (opt->name, opts_data[i].name))
+ {
+ opt_data = &opts_data[i];
+ break;
+ }
+ if (opt_data)
{
- if (streq (opt->name, short_opts[i].name))
- {
- short_opt = short_opts[i].short_opt;
- break;
- }
+ if (opt_data->short_opt)
+ printf ("\t\t-%s, --%s\n", opt_data->short_opt, opt->name);
+ else
+ printf ("\t\t --%s%s\n", opt->name, opt_data->arg);
}
- if (short_opt)
- printf ("\t\t-%s, --%s\n", short_opt, opt->name);
else
printf ("\t\t --%s\n", opt->name);
}
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);
+ assert (color_string != NULL);
if (streq (color_string, "-"))
{
gather_color_names (color_string, attr, color_names);
- assert (color_names[FOREGROUND]);
+ assert (color_names[FOREGROUND] != NULL);
if (color_names[BACKGROUND])
{
}
find_color_entries (color_names, colors);
+ assert (colors[FOREGROUND] != NULL);
free_color_names (color_names);
if (!colors[FOREGROUND]->code && colors[BACKGROUND] && colors[BACKGROUND]->code)
color_name.name = color_name.orig = "default";
find_color_entry (&color_name, FOREGROUND, colors);
+ assert (colors[FOREGROUND]->code != NULL);
}
process_file_arg (file_string, file, stream);
*file = "stdin";
}
- assert (*stream);
- assert (*file);
+ assert (*stream != NULL);
+ assert (*file != NULL);
}
static void
}
else
p = color + strlen (color);
- assert (p);
+ assert (p != NULL);
for (ch = color; *ch; ch++)
if (!isalpha (*ch))