rim 7 rev 6

Author: elydre

zapps/f/rim.c

@@ -14,6 +14,7 @@
 #include <profan/syscall.h>
 #include <profan/panda.h>
 #include <profan/clip.h>
+#include <profan/arp.h>
 #include <profan.h>
 
 #include <string.h>
@@ -48,7 +49,7 @@
 #define COLOR_U 0x80    // unknown character
 #define COLOR_W 0x08    // whitespace
 
-#define RIM_VERSION "7 rev 5"
+#define RIM_VERSION "7 rev 6"
 
 // GLOBALS
 typedef struct {
@@ -860,7 +861,7 @@ char **copy_array(char **array) {
     return copy;
 }
 
-void rim_syntax_init(char *lang) {
+void rim_syntax_init(const char *lang) {
     g_rim.syntax = calloc(1, sizeof(rim_syntax_t));
 
     if (!lang)
@@ -936,60 +937,53 @@ void rim_syntax_init(char *lang) {
 }
 
 char *compute_args(int argc, char **argv) {
-    char *file = NULL;
-    char *ext = NULL;
+    arp_init("[options] [file]", 1);
+    arp_set_ver("rim", RIM_VERSION);
+
+    arp_register('c', ARP_NEXT_STR, "specify syntax highlighting");
+    arp_register('n', ARP_STANDARD, "disable syntax highlighting");
+    arp_register('s', ARP_STANDARD, "always save file at exit");
+    arp_register('M', ARP_STANDARD, "show a memo of keyboard shortcuts");
+    arp_register('t', ARP_STANDARD, "always insert tab character");
+
+    arp_conflict("nc");
+
+    if (arp_parse(argc, argv))
+        exit(1);
+
+    const char *ext = NULL;
 
     g_rim.always_tab = 0;
 
-    for (int i = 1; i < argc; i++) {
-        if (argv[i][0] == '-') {
-            if (argv[i][1] == 'h') {
-                puts("Usage: rim [opt] [file]\n"
-                    "Options:\n"
-                    "  -c    specify syntax highlighting\n"
-                    "  -h    display this help message\n"
-                    "  -n    disable syntax highlighting\n"
-                    "  -s    always save file at exit\n"
-                    "  -t    always insert tab character\n"
-                    "  -v    display version information\n"
-                    "\nSyntax highlighting:\n"
-                    "  c, lua, py, olv\n"
-                    "\nRim Shortcuts:\n"
-                    "  ctrl + q   quit\n"
-                    "  ctrl + s   save\n"
-                    "  ctrl + c   copy\n"
-                    "  ctrl + x   cut\n"
-                    "  ctrl + v   paste\n"
-                    "  ctrl + m   page down\n"
-                    "  ctrl + p   page up\n"
-                    "  ctrl + a   home\n"
-                    "  ctrl + e   end"
-                );
-                exit(0);
-            } else if (argv[i][1] == 't') {
-                g_rim.always_tab = 1;
-            } else if (argv[i][1] == 'n') {
-                ext = "txt";
-            } else if (argv[i][1] == 's') {
-                g_rim.save_at_exit = 1;
-            } else if (argv[i][1] == 'c') {
-                if (i + 1 >= argc) {
-                    fprintf(stderr, "rim: missing argument for option -- 'c'\n");
-                    exit(1);
-                }
-                ext = argv[++i];
-            } else if (argv[i][1] == 'v') {
-                puts("rim version " RIM_VERSION ", profanOS text editor");
-                exit(0);
-            } else {
-                fprintf(stderr, "rim: unknown option -- '%s'\n", argv[i] + 1);
-                exit(1);
-            }
-        } else {
-            file = argv[i];
-        }
+    if (arp_isset('M')) {
+        puts("Rim Shortcuts:\n"
+            "  ctrl + q   quit\n"
+            "  ctrl + s   save\n"
+            "  ctrl + c   copy\n"
+            "  ctrl + x   cut\n"
+            "  ctrl + v   paste\n"
+            "  ctrl + m   page down\n"
+            "  ctrl + p   page up\n"
+            "  ctrl + a   home\n"
+            "  ctrl + e   end\n\n"
+            "Syntax highlighting:\n"
+            "  c, lua, py, olv"
+        );
+
+        exit(0);
     }
 
+    if (arp_isset('t'))
+        g_rim.always_tab = 1;
+    if (arp_isset('n'))
+        ext = "txt";
+    if (arp_isset('s'))
+        g_rim.save_at_exit = 1;
+    if (arp_isset('c'))
+        ext = arp_get_str('c');
+
+    const char *file = arp_file_next();
+
     if (ext == NULL && file) {
         ext = strrchr(file, '.');
         if (ext) ext++;
@@ -1000,9 +994,7 @@ char *compute_args(int argc, char **argv) {
     if (!file)
         return NULL;
 
-    file = profan_path_join(profan_wd_path, file);
-
-    return file;
+    return profan_path_join(profan_wd_path, file);
 }
 
 int main(int argc, char **argv) {