feat: added flag aliases

aryanjassal · aryanjassal · commit 1d440dc82913 · 2025-07-28T21:52:55.000+10:00
diff --git a/include/utils/args.h b/include/utils/args.h
@@ -9,12 +9,11 @@ typedef int (*cmd_handlefunc_t)(int argc, char* argv[], int flagc,
                                 char* flagv[], const char* path,
                                 struct cmd_handler_t* self);
 
-typedef void (*flag_handlefunc_t)(const char* path, struct cmd_handler_t* ctx);
-
+/* The flags aren't statically processed, and don't need a handler. */
 typedef struct {
-  const char* flag;
+  const char** aliases;
+  int num_aliases;
   const char* description;
-  const flag_handlefunc_t handler;
   bool lazy;
 } flag_handler_t;
 
diff --git a/src/command/agent/reset.c b/src/command/agent/reset.c
@@ -72,9 +72,12 @@ int handler_agent_reset(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/agent/setup.c b/src/command/agent/setup.c
@@ -82,9 +82,12 @@ int handler_agent_setup(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/bin/create.c b/src/command/bin/create.c
@@ -23,9 +23,12 @@ int handler_bin_create(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/bin/export.c b/src/command/bin/export.c
@@ -28,9 +28,12 @@ int handler_bin_export(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/bin/import.c b/src/command/bin/import.c
@@ -51,9 +51,12 @@ int handler_bin_import(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/bin/ls.c b/src/command/bin/ls.c
@@ -20,9 +20,12 @@ int handler_bin_ls(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/bin/rename.c b/src/command/bin/rename.c
@@ -20,9 +20,12 @@ int handler_bin_rename(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/bin/rm.c b/src/command/bin/rm.c
@@ -20,9 +20,12 @@ int handler_bin_rm(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/file/add.c b/src/command/file/add.c
@@ -22,9 +22,12 @@ int handler_file_add(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/file/cat.c b/src/command/file/cat.c
@@ -14,7 +14,7 @@
 #include "utils/cli.h"
 #include "utils/io.h"
 
-static void print_data(const buf_t *data) {
+static void print_data(const buf_t* data) {
   fwrite(data->data, sizeof(uint8_t), data->size, stdout);
   fflush(stdout);
 }
@@ -26,9 +26,12 @@ int handler_file_cat(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
@@ -82,7 +85,7 @@ int handler_file_cat(int argc, char* argv[], int flagc, char* flagv[],
   buf_initf(&aes_key, AES_KEY_SIZE);
   buf_initf(&buf_meta, BIN_GLOBAL_HEADER_SIZE - BIN_MAGIC_SIZE);
   bin_meta(buf_to_cstr(&bin_path), &buf_meta);
-  bin_meta_t meta = *(bin_meta_t *)buf_meta.data;
+  bin_meta_t meta = *(bin_meta_t*)buf_meta.data;
   buf_view(&id, meta.id, BIN_ID_SIZE);
 
   /* Read database */
diff --git a/src/command/file/cp.c b/src/command/file/cp.c
@@ -24,9 +24,12 @@ int handler_file_cp(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
diff --git a/src/command/file/get.c b/src/command/file/get.c
@@ -14,9 +14,9 @@
 #include "utils/io.h"
 #include "utils/system.h"
 
-FILE *out_file = NULL;
+FILE* out_file = NULL;
 
-static void write_data(const buf_t *data) {
+static void write_data(const buf_t* data) {
   if (!out_file) return error("Output is not open");
   fwrites(data->data, data->size, out_file);
 }
@@ -29,9 +29,12 @@ int handler_file_get(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
@@ -85,7 +88,7 @@ int handler_file_get(int argc, char* argv[], int flagc, char* flagv[],
   buf_initf(&aes_key, AES_KEY_SIZE);
   buf_initf(&buf_meta, BIN_GLOBAL_HEADER_SIZE - BIN_MAGIC_SIZE);
   bin_meta(buf_to_cstr(&bin_path), &buf_meta);
-  bin_meta_t meta = *(bin_meta_t *)buf_meta.data;
+  bin_meta_t meta = *(bin_meta_t*)buf_meta.data;
   buf_view(&id, meta.id, BIN_ID_SIZE);
 
   /* Read database */
diff --git a/src/command/file/ls.c b/src/command/file/ls.c
@@ -21,9 +21,12 @@ int handler_file_ls(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
@@ -77,7 +80,7 @@ int handler_file_ls(int argc, char* argv[], int flagc, char* flagv[],
   buf_initf(&aes_key, AES_KEY_SIZE);
   buf_initf(&buf_meta, BIN_GLOBAL_HEADER_SIZE - BIN_MAGIC_SIZE);
   bin_meta(buf_to_cstr(&bin_path), &buf_meta);
-  bin_meta_t meta = *(bin_meta_t *)buf_meta.data;
+  bin_meta_t meta = *(bin_meta_t*)buf_meta.data;
   buf_view(&id, meta.id, BIN_ID_SIZE);
 
   /* Read database */
@@ -118,7 +121,7 @@ int handler_file_ls(int argc, char* argv[], int flagc, char* flagv[],
   } else {
     size_t offset = 0;
     while (offset < paths.size) {
-      const char *path = (const char *)&paths.data[offset];
+      const char* path = (const char*)&paths.data[offset];
       printf("%s\n", path);
       offset += strlen(path) + 1;
     }
diff --git a/src/command/file/mv.c b/src/command/file/mv.c
@@ -24,9 +24,12 @@ int handler_file_mv(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
@@ -95,17 +98,15 @@ int handler_file_mv(int argc, char* argv[], int flagc, char* flagv[],
     precode = EXIT_INVALID_DB_VALUE;
     goto preclean;
   }
-  preclean:
+preclean:
   buf_free(&buf_meta);
   db_close(&db);
   db_free(&db);
   buf_free(&db_path);
   buf_free(&db_key);
 
   /* If the code is not zero, then we failed */
-  if (precode != 0) {
-    return precode;
-  } 
+  if (precode != 0) { return precode; }
 
   /* Write a file to bin */
   buf_t fq_spath, fq_dpath, bin_tpath, bin_otpath, data;
diff --git a/src/command/file/rm.c b/src/command/file/rm.c
@@ -20,9 +20,12 @@ int handler_file_rm(int argc, char* argv[], int flagc, char* flagv[],
     const char* flag = flagv[fi];
 
     /* Help flag */
-    if (strcmp(flag, flag_help.flag) == 0) {
-      print_help(HELP_REQUESTED, path, self, NULL);
-      return EXIT_OK;
+    int ai;
+    for (ai = 0; ai < flag_help.num_aliases; ++ai) {
+      if (strcmp(flag, flag_help.aliases[ai]) == 0) {
+        print_help(HELP_REQUESTED, path, self, NULL);
+        return EXIT_OK;
+      }
     }
 
     /* Fail on extra flags */
@@ -76,7 +79,7 @@ int handler_file_rm(int argc, char* argv[], int flagc, char* flagv[],
   buf_initf(&aes_key, AES_KEY_SIZE);
   buf_initf(&buf_meta, BIN_GLOBAL_HEADER_SIZE - BIN_MAGIC_SIZE);
   bin_meta(buf_to_cstr(&bin_path), &buf_meta);
-  bin_meta_t meta = *(bin_meta_t *)buf_meta.data;
+  bin_meta_t meta = *(bin_meta_t*)buf_meta.data;
   buf_view(&id, meta.id, BIN_ID_SIZE);
 
   /* Read database */
diff --git a/src/db.c b/src/db.c
diff --git a/src/main.c b/src/main.c
diff --git a/src/utils/args.c b/src/utils/args.c
