Remove generated file ltmain.sh

[grrobot] / src / args.c

diff --git a/src/args.c b/src/args.c
index 98aa80cb2feccd95ae3ffc1ed944fd34045ff214..1498dbb62ec4164634b408c36294c70dddbf4b56 100644 (file)
--- a/src/args.c
+++ b/src/args.c
@@ -35,16 +35,15 @@ const char *argp_program_bug_address = "<carl@theworths.org>";
 
 static char doc[] = "grrobot - Ricochet Robot using GTK+ and Xr";
 
-/* XXX: SAMPLE: */
-static char args_doc[] = "<file>";
+static char args_doc[] = "[file]";
 
-static struct argp_option options[] = {
-    /* name,           key, arg,       flags, doc */
-    {"host",           'h', "HOST", 0, "Host running RR server"},
-    {"port",           'p', "PORT", 0, "Port of server"},
-    {"user",           'u', "USERNAME", 0, "Username for conection"},
-    {"game",           'g', "GAME", 0, "Game to join"},
-    { 0 }
+static struct option options[] = {
+    {"host",           required_argument,      0,      'h'},
+    {"port",           required_argument,      0,      'p'},
+    {"user",           required_argument,      0,      'u'},
+    {"game",           required_argument,      0,      'g'},
+    {"watch",          no_argument,            0,      'w'},
+    {0,                0,                      0,      0}
 };
 
 static error_t
@@ -65,17 +64,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'g':
        args->game = arg;
        break;
-
-    case ARGP_KEY_ARG:
-       argp_usage (state);
+    case 'w':
+       args->watch = 1;
        break;
 
-/*
-    case ARGP_KEY_END:
-       if (state->arg_num < 1)
-           argp_usage (state);
+    case ARGP_KEY_ARG:
+       args->file = arg;
        break;
-*/
 
     default:
        return ARGP_ERR_UNKNOWN;
@@ -101,6 +96,11 @@ args_parse(args_t *args, int argc, char *argv[])
     args->game = getenv ("RR_GAME");
     if (args->game == NULL)
        args->game = ARGS_GAME_DEFAULT;
+    args->watch = 0;
 
-    return argp_parse (&argp, argc, argv, 0, 0, args);
+    args->file = NULL;
+    return 0;
+    return argp_parse (&argp, argc, argv,
+                      ARGP_LONG_ONLY,
+                      NULL, args);
 }