Move center_text function into utils.c/utils.h

* Remove 'v' prefix
* Print version the same way in the indexer

3 files changed, 45 insertions, 1 deletions

diff --git a/src/cli/stasis_indexer/stasis_indexer_main.c b/src/cli/stasis_indexer/stasis_indexer_main.c
index 071057a..e87122e 100644
--- a/src/cli/stasis_indexer/stasis_indexer_main.c
+++ b/src/cli/stasis_indexer/stasis_indexer_main.c
@@ -304,7 +304,17 @@ int main(const int argc, char *argv[]) {
 
     struct Delivery ctx = {0};
 
-    printf(BANNER, VERSION, AUTHOR);
+    char *version = center_text(VERSION, strlen(STASIS_BANNER_HEADER));
+    if (!version) {
+        SYSERROR("%s", "version too long?");
+        version = strdup(VERSION);
+        if (!version) {
+            SYSERROR("%s", "unable to allocate uncentered fallback version string");
+            exit(1);
+        }
+    }
+    printf(BANNER, version, AUTHOR);
+    guard_free(version);
 
     indexer_init_dirs(&ctx, workdir);
 
diff --git a/src/lib/core/include/utils.h b/src/lib/core/include/utils.h
index 5bd037f..194f8e7 100644
--- a/src/lib/core/include/utils.h
+++ b/src/lib/core/include/utils.h
@@ -491,4 +491,5 @@ int get_random_bytes(char *result, size_t maxlen);
  */
 int non_format_len(const char *s);
 
+char *center_text(const char *s, size_t maxwidth);
 #endif //STASIS_UTILS_H
diff --git a/src/lib/core/utils.c b/src/lib/core/utils.c
index 5ba10c4..72ecfc9 100644
--- a/src/lib/core/utils.c
+++ b/src/lib/core/utils.c
@@ -1249,3 +1249,36 @@ int non_format_len(const char *s) {
     return len;
 }
 
+char *center_text(const char *s, const size_t maxwidth) {
+    if (maxwidth < 2) {
+        SYSERROR("%s", "maximum width must be greater than 0");
+        return NULL;
+    }
+
+    if (maxwidth % 2 != 0) {
+        SYSERROR("maximum width (%zu) must be even", maxwidth);
+        return NULL;
+    }
+
+    const size_t s_len = strlen(s);
+    if (s_len + 1 > maxwidth) {
+        SYSERROR("length of input string (%zu) exceeds maximum width (%zu)", s_len, maxwidth);
+        return NULL;
+    }
+
+    char *result = calloc(maxwidth + 1, sizeof(*result));
+    if (!result) {
+        SYSERROR("%s", "unable to allocate bytes for centered text string");
+        return NULL;
+    }
+    const size_t middle = (maxwidth / 2) - s_len / 2;
+    size_t i = 0;
+    for (; i < middle; i++) {
+        result[i] = ' ';
+    }
+    strncpy(&result[i], s, maxwidth - middle - 1);
+    result[maxwidth] = '\0';
+
+    return result;
+}
+