aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-05-21 12:51:17 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-05-21 12:51:17 -0400
commitcceae6b42ddf693089357087dbcacd3cae3e7598 (patch)
tree64fa63401681b941e0485ecbab74b5625a0cf1b6
parent30c9945e0da19305ebad88a2835653ff4f409313 (diff)
downloadohmycal-cceae6b42ddf693089357087dbcacd3cae3e7598.tar.gz
Consolidate OMC_COLOR_ defines
-rw-r--r--include/utils.h40
-rw-r--r--src/utils.c7
2 files changed, 40 insertions, 7 deletions
diff --git a/include/utils.h b/include/utils.h
index 43bb618..a340cd7 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -188,6 +188,28 @@ char *git_rev_parse(const char *path, char *args);
*/
int path_store(char **destptr, size_t maxlen, const char *base, const char *path);
+#if defined(OMC_DUMB_TERMINAL)
+#define OMC_COLOR_RED ""
+#define OMC_COLOR_GREEN ""
+#define OMC_COLOR_YELLOW ""
+#define OMC_COLOR_BLUE ""
+#define OMC_COLOR_WHITE ""
+#define OMC_COLOR_RESET ""
+#else
+//! Set output color to red
+#define OMC_COLOR_RED "\e[1;91m"
+//! Set output color to green
+#define OMC_COLOR_GREEN "\e[1;92m"
+//! Set output color to yellow
+#define OMC_COLOR_YELLOW "\e[1;93m"
+//! Set output color to blue
+#define OMC_COLOR_BLUE "\e[1;94m"
+//! Set output color to white
+#define OMC_COLOR_WHITE "\e[1;97m"
+//! Reset output color to terminal default
+#define OMC_COLOR_RESET "\e[0;37m\e[0m"
+#endif
+
#define OMC_MSG_SUCCESS 0
//! Suppress printing of the message text
#define OMC_MSG_NOP 1 << 0
@@ -309,6 +331,24 @@ char *collapse_whitespace(char **s);
*/
int redact_sensitive(const char **to_redact, char *src, char *dest, size_t maxlen);
+/**
+ * Given a directory path, return a list of files
+ *
+ * ~~~{.c}
+ * struct StrList *files;
+ *
+ * basepath = ".";
+ * files = listdir(basepath);
+ * for (size_t i = 0; i < strlist_count(files); i++) {
+ * char *filename = strlist_item(files, i);
+ * printf("%s/%s\n", basepath, filename);
+ * }
+ * guard_strlist_free(&files);
+ * ~~~
+ *
+ * @param path of a directory
+ * @return a StrList containing file names
+ */
struct StrList *listdir(const char *path);
#endif //OMC_UTILS_H
diff --git a/src/utils.c b/src/utils.c
index ea79f10..7cc3e6e 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -385,13 +385,6 @@ char *git_rev_parse(const char *path, char *args) {
return version;
}
-#define OMC_COLOR_RED "\e[1;91m"
-#define OMC_COLOR_GREEN "\e[1;92m"
-#define OMC_COLOR_YELLOW "\e[1;93m"
-#define OMC_COLOR_BLUE "\e[1;94m"
-#define OMC_COLOR_WHITE "\e[1;97m"
-#define OMC_COLOR_RESET "\e[0;37m\e[0m"
-
void msg(unsigned type, char *fmt, ...) {
FILE *stream = NULL;
char header[255];