Remove dependency on libsimple since it's not portable

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 110 insertions, 5 deletions

diff --git a/src/common.h b/src/common.h
index 9234e43..aa9af94 100644
--- a/src/common.h
+++ b/src/common.h
@@ -20,8 +20,6 @@
 #ifndef REDSHIFT_COMMON_H
 #define REDSHIFT_COMMON_H
 
-#include <libsimple.h>
-#include <libsimple-arg.h>
 
 #ifndef WINDOWS
 # if defined(__WIN32__) || defined(_WIN32)
@@ -29,6 +27,9 @@
 # endif
 #endif
 
+
+#include "arg.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <ctype.h>
@@ -40,6 +41,7 @@
 #include <locale.h>
 #include <math.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,6 +56,7 @@
 # define localtime_r(T, TM) localtime_s((TM), (T))
 # define pause()  millisleep(100U)
 #else
+# include <sys/file.h>
 # include <poll.h>
 # include <pwd.h>
 # include <time.h>
@@ -140,6 +143,33 @@
  */
 #define FNAN ((double)NAN) /* because clang warns when implicitly promoted to double */
 
+/**
+ * Get the number of elements in an array
+ * 
+ * @param   ARR      The array, must not be a pointer
+ * @return  :size_t  The number of elements in `ARR` (constant
+ *                   expression, unless its size is dynamic)
+ */
+#define ELEMSOF(ARR) (sizeof(ARR) / (sizeof(*(ARR))))
+
+/**
+ * Get the smallest of two numerical values
+ * 
+ * @param   A  One of the values
+ * @param   B  The other value
+ * @return     The smallest of `A` and `B`
+ */
+#define MIN(A, B) ((A) < (B) ? (A) : (B))
+
+/**
+ * Get the largest of two numerical values
+ * 
+ * @param   A  One of the values
+ * @param   B  The other value
+ * @return     The largest of `A` and `B`
+ */
+#define MAX(A, B) ((A) > (B) ? (A) : (B))
+
 
 /**
  * Symbol used to delimit paths in environment
@@ -1132,13 +1162,88 @@ DIR *try_path_opendir(const struct env_path *path_spec, const char **path_out, c
  * Create a pipe(7) where both ends have `O_CLOEXEC`,
  * the read-end will also have `O_NONBLOCK` applied
  * 
- * @param   pipefds  Output parameter for the pipe's file descriptors:
- *                   0) reading file descriptor, and
- *                   1) writing file descriptor
+ * @param  pipefds  Output parameter for the pipe's file descriptors:
+ *                  0) reading file descriptor, and
+ *                  1) writing file descriptor
  */
 void pipe_rdnonblock(int pipefds[2]);
 #endif
 
+/**
+ * Wrapper for calloc(3) that prints and error message
+ * and terminates the process on failure
+ * 
+ * @param   n  Number of elements to allocate memory for
+ * @param   m  The size, in bytes, of each element
+ * @return     Pointer to zero-initialised storage of at least `n*m` bytes, with default alignment
+ */
+GCC_ONLY(__attribute__((__warn_unused_result__, __malloc__, __alloc_size__(1, 2), __returns_nonnull__)))
+void *ecalloc(size_t n, size_t m);
+
+/**
+ * Wrapper for malloc(3) that prints and error message
+ * and terminates the process on failure
+ * 
+ * @param   n  Number of bytes to allocate
+ * @return     Pointer to uninitialised storage of at least `n` bytes, with default alignment
+ */
+GCC_ONLY(__attribute__((__warn_unused_result__, __malloc__, __alloc_size__(1), __returns_nonnull__)))
+void *emalloc(size_t n);
+
+/**
+ * Wrapper for realloc(3) that prints and error message
+ * and terminates the process on failure
+ * 
+ * @param   ptr  Pointer to reallocate
+ * @param   n    Despired allocation size in bytes
+ * @return       Replacement pointer for `ptr`, pointing to storage of at least `n` bytes,
+ *               any byte that could be copied from `ptr` is copied over, and additional
+ *               memory is uninitialised
+ */
+GCC_ONLY(__attribute__((__warn_unused_result__, __returns_nonnull__, __alloc_size__(2))))
+void *erealloc(void *ptr, size_t n);
+
+/**
+ * Wrapper for strdup(3) that prints and error message
+ * and terminates the process on failure
+ * 
+ * @param   s  String to copy
+ * @return     Copy of `s`
+ */
+GCC_ONLY(__attribute__((__warn_unused_result__, __returns_nonnull__, __malloc__, __assume_aligned__(1), __nonnull__)))
+char *estrdup(const char *s);
+
+/**
+ * Print a message, prefixed with the process name (followed by ": "),
+ * to standard error
+ * 
+ * @param  fmt   Message text format string, see fprintf(3)
+ * @param  args  Message text arguments
+ */
+GCC_ONLY(__attribute__((__nonnull__(1), __format__(__printf__, 1, 0))))
+void vweprintf(const char *fmt, va_list args);
+
+/**
+ * Print a message, prefixed with the process name (followed by ": "),
+ * to standard error
+ * 
+ * @param  fmt  Message text format string, see fprintf(3)
+ * @param  ...  Message text arguments
+ */
+GCC_ONLY(__attribute__((__nonnull__(1), __format__(__printf__, 1, 2))))
+void weprintf(const char *fmt, ...);
+
+/**
+ * Print a message, prefixed with the process name (followed by ": "),
+ * to standard error and terminate the process with exit value
+ * indicating error
+ * 
+ * @param  fmt  Message text format string, see fprintf(3)
+ * @param  ...  Message text arguments
+ */
+GCC_ONLY(__attribute__((__nonnull__(1), __format__(__printf__, 1, 2), __noreturn__)))
+void eprintf(const char *fmt, ...);
+
 
 extern const struct gamma_method dummy_gamma_method;
 #ifdef ENABLE_COOPGAMMA