===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/gzsig/Attic/verify.c,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -r1.1 -r1.7
--- src/usr.bin/gzsig/Attic/verify.c	2005/05/28 01:57:30	1.1
+++ src/usr.bin/gzsig/Attic/verify.c	2007/10/12 19:52:06	1.7
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.1 2005/05/28 01:57:30 marius Exp $ */
+/* $OpenBSD: verify.c,v 1.7 2007/10/12 19:52:06 jasper Exp $ */
 
 /*
  * verify.c
@@ -30,7 +30,7 @@
  *   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  *   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: verify.c,v 1.1 2005/05/28 01:57:30 marius Exp $
+ * $Vendor: verify.c,v 1.3 2005/04/07 23:19:35 dugsong Exp $
  */
 
 #include <sys/types.h>
@@ -144,7 +144,8 @@
 void
 verify_usage(void)
 {
-	fprintf(stderr, "Usage: gzsig verify [-v] pubkey [file ...]\n");
+	fprintf(stderr, "Usage: %s verify [-q] [-f secret_file] pubkey [file ...]\n",
+	    __progname);
 }
 
 void
@@ -153,14 +154,17 @@
 	struct key *key;
 	char *gzipfile;
 	FILE *fin;
-	int i, error, vflag;
+	int i, error, qflag;
 
-	vflag = 0;
+	qflag = 0;
 	
-	while ((i = getopt(argc, argv, "vh?")) != -1) {
+	while ((i = getopt(argc, argv, "qv")) != -1) {
 		switch (i) {
+		case 'q':
+			qflag = 1;
+			break;
 		case 'v':
-			vflag = 1;
+			qflag = 0;
 			break;
 		default:
 			verify_usage();
@@ -186,7 +190,7 @@
 		argc = 0;
 		
 		if (verify_signature(key, stdin) == 0) {
-			if (vflag)
+			if (!qflag)
 				fprintf(stderr, "Verified input\n");
 		} else
 			fatal(1, "Couldn't verify input");
@@ -194,7 +198,7 @@
 	for (i = 1; i < argc; i++) {
 		gzipfile = argv[i];
 
-		if ((fin = fopen(gzipfile, "r")) < 0) {
+		if ((fin = fopen(gzipfile, "r")) == NULL) {
 			fprintf(stderr,  "Couldn't open %s: %s\n",
 			    gzipfile, strerror(errno));
 			continue;
@@ -203,7 +207,7 @@
 		fclose(fin);
 
 		if (!error) {
-			if (vflag)
+			if (!qflag)
 				fprintf(stderr, "Verified %s\n", gzipfile);
 		} else
 			fatal(1, "Couldn't verify %s", gzipfile);