X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..6a024d24d97cb5d42c0091571735475b849f59f4:/progs/mkphrase.c

diff --git a/progs/mkphrase.c b/progs/mkphrase.c
index 17fcb9cf..b84d850b 100644
--- a/progs/mkphrase.c
+++ b/progs/mkphrase.c
@@ -55,7 +55,9 @@ static unsigned min = 0, max = 256;	/* Word length bounds */
 static unsigned minbits = 128, maxbits = UINT_MAX; /* Acceptable entropy */
 static unsigned count = 1;		/* How many passphrases to make */
 
-static const char wchars[] = "abcdefghijklmnopqrstuvwxyz'";
+static const char
+  all_wchars[] = "'abcdefghijklmnopqrstuvwxyz",
+  *wchars = all_wchars;
 
 typedef struct ppgen_ops {
   const char *name;			/* Name of the generator */
@@ -320,6 +322,7 @@ int main(int argc, char *argv[])
       { "help",		0,		0,	'h' },
       { "version",	0,		0,	'v' },
       { "usage",	0,		0,	'u' },
+      { "no-apostrophe", 0,		0,	'A' },
       { "bits",		OPTF_ARGREQ,	0,	'b' },
       { "generator",	OPTF_ARGREQ,	0,	'g' },
       { "count",	OPTF_ARGREQ,	0,	'n' },
@@ -327,7 +330,7 @@ int main(int argc, char *argv[])
       { "range",	OPTF_ARGREQ,	0,	'r' },
       { 0,		0,		0,	0 }
     };
-    int i = mdwopt(argc, argv, "hvu b:g:n:pr:", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "hvu Ab:g:n:pr:", opts, 0, 0, 0);
 
     if (i < 0)
       break;
@@ -341,6 +344,9 @@ int main(int argc, char *argv[])
       case 'u':
 	usage(stdout);
 	exit(0);
+      case 'A':
+	wchars = all_wchars + 1;
+	break;
       case 'b': {
 	char *p;
 	minbits = strtoul(optarg, &p, 0);