[Pgp-tools-commit] r391 - in trunk: debian keyanalyze

[myon at alioth.debian.org]

Author: myon
Date: 2008-07-18 13:42:10 +0000 (Fri, 18 Jul 2008)
New Revision: 391

Modified:
   trunk/debian/changelog
   trunk/keyanalyze/keyanalyze.1
   trunk/keyanalyze/keyanalyze.c
Log:
Add -h option to keyanalyze, and update manpage. (Closes: #370570)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-18 13:34:49 UTC (rev 390)
+++ trunk/debian/changelog	2008-07-18 13:42:10 UTC (rev 391)
@@ -11,11 +11,12 @@
       (Closes: #309101)
     + Update config.{sub,guess}. (Closes: #365148)
     + Add patch by Stephan Beyer to improve process_keys' input parsing,
-      remedying to need of weird grep and sed commands. (Closes: #370571)
+      remedying the need of weird grep and sed commands. (Closes: #370571)
+    + Add -h option to keyanalyze, and update manpage. (Closes: #370570)
   * Put examples in .../examples/$prog, not the other way round.
   * Use dh_lintian.
 
- -- Christoph Berg <myon at debian.org>  Fri, 18 Jul 2008 15:30:06 +0200
+ -- Christoph Berg <myon at debian.org>  Fri, 18 Jul 2008 15:41:28 +0200
 
 signing-party (1.0-2) unstable; urgency=low
 

Modified: trunk/keyanalyze/keyanalyze.1
===================================================================
--- trunk/keyanalyze/keyanalyze.1	2008-07-18 13:34:49 UTC (rev 390)
+++ trunk/keyanalyze/keyanalyze.1	2008-07-18 13:42:10 UTC (rev 391)
@@ -12,7 +12,7 @@
 keyanalyze \- Web of Trust analysis
 
 .SH SYNTAX
-\fBkeyanalyze\fP [ \fB\-i\fP \fIinfile\fP ] [ \fB\-o\fP \fIoutdir\fP ] [ \fB\-1\fP ]
+\fBkeyanalyze\fP [ \fB\-h1\fP ] [ \fB\-i\fP \fIinfile\fP ] [ \fB\-o\fP \fIoutdir\fP ]
 
 .SH DESCRIPTION
 \fIkeyanalyze\fP analyses the web of trust within a group of keys.  It
@@ -20,6 +20,10 @@
 .BR process_keys (1))
 and produces an output directory full of statistics about the keys.
 
+Usually called like
+ $ pgpring -S -k ./keyring.gpg | process_keys > preprocess.keys
+ $ keyanalyze
+
 .SH OPTIONS
 .TP
 .BI \-i " infile"
@@ -29,6 +33,9 @@
 Put the results in \fIoutdir\fP instead of \fBoutput/\fP.  The directory
 will be created if it does not already exist.
 .TP
+.BI \-h
+Print help.
+.TP
 .BI \-1
 Per default, \fBkeyanalyze\fP writes the output into subdirectories named after
 the first two characters of the key ID. This options disables this; useful for

Modified: trunk/keyanalyze/keyanalyze.c
===================================================================
--- trunk/keyanalyze/keyanalyze.c	2008-07-18 13:34:49 UTC (rev 390)
+++ trunk/keyanalyze/keyanalyze.c	2008-07-18 13:42:10 UTC (rev 391)
@@ -293,10 +293,14 @@
 	int outdirlen;
 
 	while (1) {
-		int option = getopt(argc, argv, "i:o:1");
+		int option = getopt(argc, argv, "hi:o:1");
 		if (option == -1)
 			break;
 		switch (option) {
+		case 'h':
+			printf ("Usage: %s [-h1] [-i infile] [-o outdir]\n", argv[0]);
+			exit (0);
+			break;
 		case 'i':
 			infile = optarg;
 			break;