X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b55540f69066f9127c964af2097b7563ab69369c..5278d9afdf1aff9fd6f64073ea42395d756ee58c:/mkphrase.c

diff --git a/mkphrase.c b/mkphrase.c
index f315108..0a73e36 100644
--- a/mkphrase.c
+++ b/mkphrase.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mkphrase.c,v 1.1 2000/08/06 10:50:55 mdw Exp $
+ * $Id$
  *
  * Generate passphrases from word lists
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,27 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mkphrase.c,v $
- * Revision 1.1  2000/08/06 10:50:55  mdw
- * (mkphrase): New program for generating random passphrases with measured
- * strength.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -188,7 +179,7 @@ static void *markov_init(void)
 {
   node (*model)[VECSZ][VECSZ][VECSZ] = xmalloc(sizeof(*model));
   unsigned i, j, k, l;
-  
+
   for (i = 0; i < VECSZ; i++) {
     for (j = 0; j < VECSZ; j++) {
       for (k = 0; k < VECSZ; k++) {
@@ -283,7 +274,7 @@ static void version(FILE *fp)
 static void usage(FILE *fp)
 {
   pquis(fp, "\
-Usage: $ [-p] [-b bits] [-g gen] [-n count] [-r [min-]max] wordlist...\n\
+Usage: $ [-p] [-b BITS] [-g GEN] [-n COUNT] [-r [MIN-]MAX] WORDLIST...\n\
 ");
 }
 
@@ -321,10 +312,8 @@ int main(int argc, char *argv[])
   dstr dd = DSTR_INIT;
   unsigned i;
 
-  enum {
-    f_bogus = 1,
-    f_showp = 2
-  };
+#define f_bogus 1u
+#define f_showp 2u
 
   ego(argv[0]);
   for (;;) {
@@ -418,7 +407,7 @@ int main(int argc, char *argv[])
   ctx = ops->init();
   while (*argv) {
     if (strcmp(*argv, "-") == 0)
-      ops->scan(ctx, stdin);
+      ops->scan(stdin, ctx);
     else {
       FILE *fp = fopen(*argv, "r");
       if (!fp) {