main: use getopt() to parse arguments

2 files changed, 37 insertions, 11 deletions

diff --git a/src/main.c b/src/main.c
index 5744874..15171da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,9 +19,43 @@
 #define _GNU_SOURCE
 
 #include <msg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+msg_t *msg;
+
+void
+usage(char *program)
+{
+  printf("Usage: %s [-o <output>] [-h] <directory>\n", program);
+  printf("\t-o <output>: Output directory\n");
+  printf("\t-h         : Help\n");
+  printf("\t<directory>: Working directory\n");
+}
 
 int
 main(int argc, char **argv)
 {
-  return run(argc, argv);
+  int opt;
+  msg = malloc(sizeof(msg_t));
+
+  while ((opt = getopt(argc, argv, "o:h")) != -1) {
+    switch (opt) {
+    case 'o':
+      /* msg.output_directory = optarg; */
+      break;
+    case 'h':
+    default:
+      usage(argv[0]);
+      return EXIT_SUCCESS;
+    }
+  }
+
+  msg->base_directory = "compromyse.xyz";
+
+  int r = run();
+
+  free(msg);
+  return r;
 }
diff --git a/src/msg.c b/src/msg.c
index dc525fd..fc385b8 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -36,8 +36,8 @@
 #include <template.h>
 #include <util.h>
 
+extern msg_t *msg;
 template_t *base_template;
-msg_t *msg;
 
 void
 handle_file(const char *path)
@@ -108,15 +108,8 @@ handle_file(const char *path)
 }
 
 int
-run(int argc, char **argv)
+run(void)
 {
-  if (argc < 2) {
-    printf("Usage: %s [directory]\n", argv[0]);
-    return EXIT_FAILURE;
-  }
-  msg = malloc(sizeof(msg_t));
-  msg->base_directory = argv[1];
-
   struct stat sb;
   if (stat(msg->base_directory, &sb) != 0 || !S_ISDIR(sb.st_mode)) {
     printf("%s does not exist.\n", msg->base_directory);
@@ -156,6 +149,5 @@ run(int argc, char **argv)
   template_delete(base_template);
   config_delete(config);
 
-  free(msg);
   return EXIT_SUCCESS;
 }