Allow minimum word length to be set on command line. Patch based on

one by Joey Hess <joeyh@debian.org>.

diff --git a/hangman/extern.c b/hangman/extern.c
index 9a4891beb2a3b1279a1dae61dc56d6207c4d07eb..9b9585e93af8ac35ec1ae2bf9619cba30b190ac1 100644 (file)
--- a/hangman/extern.c
+++ b/hangman/extern.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.c,v 1.6 1999/09/17 20:45:48 jsm Exp $   */
+/*     $NetBSD: extern.c,v 1.7 2002/01/20 00:42:51 jsm Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)extern.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extern.c,v 1.6 1999/09/17 20:45:48 jsm Exp $");
+__RCSID("$NetBSD: extern.c,v 1.7 2002/01/20 00:42:51 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -61,6 +61,7 @@ const char *const Noose_pict[] = {
 };
 
 int     Errors, Wordnum = 0;
+unsigned int Minlen = MINLEN;
 
 double  Average = 0.0;
 

diff --git a/hangman/getword.c b/hangman/getword.c
index 28fa3b8db170b1af3b9a31cb324f45c70209e8a8..571f0d0caa96be4fb90c89597b0d7bb808f20deb 100644 (file)
--- a/hangman/getword.c
+++ b/hangman/getword.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getword.c,v 1.6 1999/09/08 21:57:17 jsm Exp $  */
+/*     $NetBSD: getword.c,v 1.7 2002/01/20 00:42:51 jsm Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)getword.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getword.c,v 1.6 1999/09/08 21:57:17 jsm Exp $");
+__RCSID("$NetBSD: getword.c,v 1.7 2002/01/20 00:42:51 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ getword()
                if (fgets(Word, BUFSIZ, inf) == NULL)
                        continue;
                Word[strlen(Word) - 1] = '\0';
-               if (strlen(Word) < MINLEN)
+               if (strlen(Word) < Minlen)
                        continue;
                for (wp = Word; *wp; wp++)
                        if (!islower(*wp))

diff --git a/hangman/hangman.6 b/hangman/hangman.6
index 9e41e27659a7e0d0eb2c28c992420e462d0ec466..501c1b0dde51925995a64a1c577f9850fd8b4fe1 100644 (file)
--- a/hangman/hangman.6
+++ b/hangman/hangman.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: hangman.6,v 1.7 1999/09/17 20:45:49 jsm Exp $
+.\"    $NetBSD: hangman.6,v 1.8 2002/01/20 00:42:51 jsm Exp $
 .\"
 .\" Copyright (c) 1983, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -42,6 +42,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl d Ar wordlist
+.Op Fl m Ar minlen
 .Sh DESCRIPTION
 In
 .Nm "" ,
@@ -55,6 +56,8 @@ and how many wrong guesses you have made on the screen in a graphic fashion.
 Use the specified
 .Ar wordlist
 instead of the default one named below.
+.It Fl m
+Set the minimum word length to use. The default is 6 letters.
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/dict/words -compact

diff --git a/hangman/hangman.h b/hangman/hangman.h
index 3ed05db808e20cb818359ce08312128c451206de..eddf4fff9e54d67887856a961be60e0b4958bc68 100644 (file)
--- a/hangman/hangman.h
+++ b/hangman/hangman.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: hangman.h,v 1.10 1999/09/17 20:45:49 jsm Exp $ */
+/*     $NetBSD: hangman.h,v 1.11 2002/01/20 00:42:51 jsm Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -73,6 +73,7 @@ extern char Word[], Known[];
 extern const char *const Noose_pict[];
 
 extern int Errors, Wordnum;
+extern unsigned int Minlen;
 
 extern double Average;
 

diff --git a/hangman/main.c b/hangman/main.c
index 39fd09bd42338165539a9b55f205e3338462dfc8..3b94565ccb138c9c8a69007d062d5126822ae7c6 100644 (file)
--- a/hangman/main.c
+++ b/hangman/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.9 2000/05/08 07:56:04 mycroft Exp $ */
+/*     $NetBSD: main.c,v 1.10 2002/01/20 00:42:51 jsm Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -43,10 +43,11 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.9 2000/05/08 07:56:04 mycroft Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 2002/01/20 00:42:51 jsm Exp $");
 #endif
 #endif /* not lint */
 
+#include       <err.h>
 #include       "hangman.h"
 
 /*
@@ -62,14 +63,19 @@ main(argc, argv)
        /* Revoke setgid privileges */
        setgid(getgid());
 
-       while ((ch = getopt(argc, argv, "d:")) != -1) {
+       while ((ch = getopt(argc, argv, "d:m:")) != -1) {
                switch (ch) {
                case 'd':
                        Dict_name = optarg;
                        break;
+               case 'm':
+                       Minlen = atoi(optarg);
+                       if (Minlen < 2)
+                               errx(1, "minimum word length too short");
+                       break;
                case '?':
                default:
-                       (void)fprintf(stderr, "usage: hangman [-d wordlist]\n");
+                       (void)fprintf(stderr, "usage: hangman [-d wordlist] [-m minlen]\n");
                        exit(1);
                }
        }