Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/games/atc Use getopt instead of home grown command line pars...



details:   https://anonhg.NetBSD.org/src/rev/178497c52169
branches:  trunk
changeset: 474878:178497c52169
user:      mjl <mjl%NetBSD.org@localhost>
date:      Sat Jul 24 15:50:44 1999 +0000

description:
Use getopt instead of home grown command line parsing.
Patch from Joseph Myers <jsm28%cam.ac.uk@localhost> in PR/8062.

diffstat:

 games/atc/main.c |  74 ++++++++++++++++++++++---------------------------------
 1 files changed, 30 insertions(+), 44 deletions(-)

diffs (111 lines):

diff -r 8a854901ea18 -r 178497c52169 games/atc/main.c
--- a/games/atc/main.c  Sat Jul 24 15:37:03 1999 +0000
+++ b/games/atc/main.c  Sat Jul 24 15:50:44 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.9 1999/07/17 19:57:03 hubertf Exp $ */
+/*     $NetBSD: main.c,v 1.10 1999/07/24 15:50:44 mjl Exp $    */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -55,7 +55,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.9 1999/07/17 19:57:03 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 1999/07/24 15:50:44 mjl Exp $");
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@
        int                     f_usage = 0, f_list = 0, f_showscore = 0;
        int                     f_printpath = 0;
        const char              *file = NULL;
-       char                    *name, *ptr;
+       int                     ch;
        struct sigaction        sa;
 #ifdef BSD
        struct itimerval        itv;
@@ -82,56 +82,42 @@
        open_score_file();
        setregid(getgid(), getgid());
 
-       start_time = seed = time(0);
+       start_time = seed = time(NULL);
 
-       name = *av++;
-       while (*av) {
-#ifndef SAVEDASH
-               if (**av == '-') 
-                       ++*av;
-               else
+       while ((ch = getopt(ac, av, "ulstpg:f:r:")) != -1) {
+               switch (ch) {
+               case '?':
+               case 'u':
+               default: 
+                       f_usage++;
+                       break;
+               case 'l':
+                       f_list++;
                        break;
-#endif
-               ptr = *av++;
-               while (*ptr) {
-                       switch (*ptr) {
-                       case '?':
-                       case 'u':
-                               f_usage++;
-                               break;
-                       case 'l':
-                               f_list++;
-                               break;
-                       case 's':
-                       case 't':
-                               f_showscore++;
-                               break;
-                       case 'p':
-                               f_printpath++;
-                               break;
-                       case 'r':
-                               seed = atoi(*av);
-                               av++;
-                               break;
-                       case 'f':
-                       case 'g':
-                               file = *av;
-                               av++;
-                               break;
-                       default: 
-                               warnx("unknown option '%c'\n", *ptr);
-                               f_usage++;
-                               break;
-                       }
-                       ptr++;
+               case 's':
+               case 't':
+                       f_showscore++;
+                       break;
+               case 'p':
+                       f_printpath++;
+                       break;
+               case 'r':
+                       seed = atoi(optarg);
+                       break;
+               case 'f':
+               case 'g':
+                       file = optarg;
+                       break;
                }
        }
+       if (optind < ac)
+               f_usage++;
        srandom(seed);
 
        if (f_usage)
                fprintf(stderr, 
                    "Usage: %s -[u?lstp] [-[gf] game_name] [-r random seed]\n",
-                       name);
+                       av[0]);
        if (f_showscore)
                log_score(1);
        if (f_list)



Home | Main Index | Thread Index | Old Index