aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Voss <mail@thomasvoss.com> 2024-01-12 00:08:59 +0100
committerThomas Voss <mail@thomasvoss.com> 2024-01-12 00:12:28 +0100
commita0a1442be54014a622f51db7e6b8c667ad030a22 (patch)
tree31c4d9ffd5fc164aba77422a63efa05eb07d8a57
parent40379705b93986266275b3c067b4b4e9b6585f13 (diff)
Add the env_or_default() helper function
-rw-r--r--grab.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/grab.c b/grab.c
index e063f7d..851c090 100644
--- a/grab.c
+++ b/grab.c
@@ -60,6 +60,7 @@ static void grab(struct ops, FILE *, const char *);
static void putm(struct sv, const char *);
static regex_t mkregex(char *, size_t);
static struct ops comppat(char *);
+static char *env_or_default(const char *, const char *);
static bool xisspace(char);
static char *xstrchrnul(const char *, char);
@@ -130,11 +131,8 @@ main(int argc, char **argv)
argv += optind;
filecnt = argc - 1;
- if (isatty(STDOUT_FILENO) == 1) {
- const char *s;
- if (!(s = getenv("NO_COLOR")) || !*s)
- color = (s = getenv("TERM")) && strcmp(s, "dumb");
- }
+ if (isatty(STDOUT_FILENO) == 1 && env_or_default("NO_COLOR", NULL))
+ color = strcmp(env_or_default("TERM", ""), "dumb") == 0;
ops = comppat(argv[0]);
if (argc == 1)
@@ -332,10 +330,8 @@ putm(struct sv sv, const char *filename)
static const char *fnc, *sepc;
if (!fnc) {
- const char *s;
-
- fnc = (s = getenv("GRAB_COLOR_FNAME")) && *s ? s : "35";
- sepc = (s = getenv("GRAB_COLOR_SEP")) && *s ? s : "36";
+ fnc = env_or_default("GRAB_COLOR_FNAME", "35");
+ sepc = env_or_default("GRAB_COLOR_SEP", "36");
}
if (fflag || filecnt > 1) {
@@ -382,6 +378,13 @@ mkregex(char *s, size_t n)
return r;
}
+char *
+env_or_default(const char *e, const char *d)
+{
+ const char *s = getenv(e);
+ return (char *)(s && *s ? s : d);
+}
+
bool
xisspace(char c)
{