1 files changed, 79 insertions, 10 deletions

diff --git a/src/lib/utils.c b/src/lib/utils.c
index 931ee449..fd275f63 100644
--- a/src/lib/utils.c
+++ b/src/lib/utils.c
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016 - 2021
+ * Ouroboros - Copyright (C) 2016 - 2024
  *
  * Handy utilities
  *
@@ -20,29 +20,43 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
+#define _POSIX_C_SOURCE 200809L
+
+#include <ouroboros/utils.h>
+
 #include <stdlib.h>
 #include <string.h>
 
+int bufcmp(const buffer_t * a,
+           const buffer_t * b)
+{
+        if (a->len != b->len)
+                return a->len < b->len ? -1 : 1;
+
+        return memcmp(a->data, b->data, a->len);
+}
+
+
 int n_digits(unsigned i)
 {
-    int n = 1;
+        int n = 1;
 
-    while (i > 9) {
-        ++n;
-        i /= 10;
-    }
+        while (i > 9) {
+                ++n;
+                i /= 10;
+        }
 
-    return n;
+        return n;
 }
 
-char * path_strip(char * src)
+char * path_strip(const char * src)
 {
-        char * dst = NULL;
+        char * dst;
 
         if (src == NULL)
                 return NULL;
 
-        dst = src + strlen(src);
+        dst = (char *) src + strlen(src);
 
         while (dst > src && *dst != '/')
                 --dst;
@@ -52,3 +66,58 @@ char * path_strip(char * src)
 
         return dst;
 }
+
+size_t argvlen(const char ** argv)
+{
+        size_t argc   = 0;
+
+        if (argv == NULL)
+                return 0;
+
+        while (*argv++ != NULL)
+                argc++;
+
+        return argc;
+}
+
+void argvfree(char ** argv)
+{
+        char ** argv_dup;
+
+        if (argv == NULL)
+                return;
+
+        argv_dup = argv;
+        while (*argv_dup != NULL)
+                free(*(argv_dup++));
+
+        free(argv);
+}
+
+char ** argvdup(char ** argv)
+{
+        int     argc = 0;
+        char ** argv_dup = argv;
+        int     i;
+
+        if (argv == NULL)
+                return NULL;
+
+        while (*(argv_dup++) != NULL)
+                argc++;
+
+        argv_dup = malloc((argc + 1) * sizeof(*argv_dup));
+        if (argv_dup == NULL)
+                return NULL;
+
+        for (i = 0; i < argc; ++i) {
+                argv_dup[i] = strdup(argv[i]);
+                if (argv_dup[i] == NULL) {
+                        argvfree(argv_dup);
+                        return NULL;
+                }
+        }
+
+        argv_dup[argc] = NULL;
+        return argv_dup;
+}