Removed unnecessary command-line options.

[vor.git] / args.c

diff --git a/args.c b/args.c
index 0131215..9c4c62b 100644 (file)
--- a/args.c
+++ b/args.c
@@ -1,4 +1,6 @@
-#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include "args.h"
 #include "config.h"
 
@@ -9,29 +11,64 @@ float opt_max_lead;
 
 // Look and Feel
 int opt_fullscreen;
-int opt_music;
 int opt_sound;
 
-error_t parse_opt(int, char*, struct argp_state *);
+static void
+show_help(void)
+{
+       puts("Dodge the rocks until you die.");
+       putchar('\n');
+       puts("  -f, --full-screen");
+       puts("  -s, --silent               No explosion sounds or music");
+       puts("  -V, --version              Print program version");
+       puts("  -?, --help                 Give this help list");
+       putchar('\n');
+       puts("Mandatory or optional arguments to long options are also mandatory or optional");
+       puts("for any corresponding short options.");
+       putchar('\n');
+       puts("Report bugs at http://jasonwoof.com/contact.html");
+}
+
+int
+short_opt(char c, char *arg)
+{
+       switch(c) {
+               case 'f': opt_fullscreen = 1; break;
+               case 's': opt_sound = 0; break;
+               case 'V':
+                                 printf("Variations on Rockdodger %s\n", VERSION);
+                                 exit(0);
+               case '?':
+               case 'h': return 0;
+               default: 
+                                 fprintf(stderr, "unknown option -%c\n\n", c);
+                                 return 0;
+       }
+       return 1;
+}
+
+int
+parse_short_opts(const char *s, char *arg)
+{
+       while(s[1]) if(!short_opt(*s++, NULL)) return 0;
+       return short_opt(*s, arg);
+}
 
-const char *argp_program_version = "Variations on Rockdodger " VERSION;
-const char *argp_program_bug_address = "<josh@qualdan.com>";
-static char doc[] = "Dodge the rocks until you die.";
-static struct argp_option opts[] = {
-       {0, 0, 0, 0, "Gameplay Variations:"},
-       {"bounciness", 'b', "N%", 0, "Keep N% of speed when hitting edges (default 50%)"},
-       {"game-speed", 'g', "N%", 0, "50-100% (default 100%)"},
-       {"max-lead", 'l', "#SCREENS", OPTION_HIDDEN,
-               "Max distance ahead you can get\n (default 1 screen; < 0 means no limit)"},
-       {0, 0, 0, 0, "Look and Feel:"},
-       {"full-screen", 'f', 0, 0, ""},
-       {"music", 'm', 0, 0, "Enable music"},
-       {"silent", 's', 0, 0, "No explosion sounds or music"},
-       {0, 0, 0, 0, "Informational:", -1},
-       {0}
-};
+static char *long_opts[] = { "full-screen", "silent", "version", "help" };
 
-struct argp argp = { opts, &parse_opt, 0, doc };
+static char short_opts[] = { 'f', 's', 'V', 'h' };
+
+int
+parse_long_opt(const char *s, char *arg)
+{
+       int i;
+       for(i=0; i<sizeof(short_opts); i++) {
+               if(strcmp(s, long_opts[i]) == 0)
+                       return short_opt(short_opts[i], arg);
+       }
+       fprintf(stderr, "unknown long option --%s\n\n", s);
+       return 0;
+}
 
 void
 init_opts(void)
@@ -44,45 +81,33 @@ init_opts(void)
        // Look and Feel
        opt_fullscreen = 0;
        opt_sound = 1;
-       opt_music = 0;
 }
 
-error_t
-parse_opt(int key, char *arg, struct argp_state *state)
+int
+parse_opts(int argc, char *argv[])
 {
        int i;
+       char *r;
 
-       switch(key) {
-               case 'b': if(!sscanf(arg, "%d%%", &i)) {
-                                         fprintf(stderr, "bad --bounciness (-b) value (should be 0-100%%)\n");
-                                         argp_state_help(state, stderr, ARGP_HELP_STD_HELP);
-                                         return EINVAL;
-                                 }
-                                 if(i < 50) i = 50; else if(i > 100) i = 100;
-                                 opt_bounciness = (float)i / 100;
-                                 break;
-               case 'f': opt_fullscreen = 1; break;
-               case 'g': if(!sscanf(arg, "%d%%", &i)) {
-                                         fprintf(stderr, "bad --gamespeed (-g) value (should be 50-100%%)\n");
-                                         argp_state_help(state, stderr, ARGP_HELP_STD_HELP);
-                                         return EINVAL;
-                                 }
-                                 if(i < 0) i = 0; else if(i > 100) i = 100;
-                                 opt_gamespeed = (float)i / 100;
-                                 break;
-               case 'l': if(!sscanf(arg, "%f", &opt_max_lead)) {
-                                         fprintf(stderr, "bad --max-lead (-l) value (must be a number)\n");
-                                         argp_state_help(state, stderr, ARGP_HELP_STD_HELP);
-                                         return EINVAL;
-                                 }
-                                 opt_max_lead *= XSIZE;
-                                 break;
-               case 'm': opt_music = 1; break;
-               case 's': opt_sound = 0; opt_music = 0; break;
-               case ARGP_KEY_END:
-                                 break;
-               default:
-                                 return ARGP_ERR_UNKNOWN;
+       init_opts();
+       for(i=1; i<argc; i++) {
+               char *s, *arg;
+               s = argv[i]; if(!*s) continue;
+               if(*s++ != '-') {
+                       fputs("not an option\n\n", stderr);
+                       show_help();
+                       return 0;
+               }
+
+               arg = NULL;
+               for(r=s; *r; r++) if(*r == '=') { *r = 0; arg = r+1; break; }
+               if(!arg && (i+1 < argc)) arg = argv[i+1];
+
+               if(*s == '-') {
+                       if(!parse_long_opt(s+1, arg)) { show_help(); return 0; }
+               } else {
+                  if(!parse_short_opts(s, arg)) { show_help(); return 0; }
+               }
        }
-       return 0;
+       return 1;
 }