===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/signify/signify.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/signify/signify.c	2014/01/14 17:25:06	1.35
--- src/usr.bin/signify/signify.c	2014/01/14 21:33:10	1.36
***************
*** 1,4 ****
! /* $OpenBSD: signify.c,v 1.35 2014/01/14 17:25:06 tedu Exp $ */
  /*
   * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: signify.c,v 1.36 2014/01/14 21:33:10 tedu Exp $ */
  /*
   * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
   *
***************
*** 519,560 ****
  	if (argc != 0)
  		usage(NULL);
  
! 	if (verb == NONE)
! 		usage(NULL);
  
  #ifndef VERIFYONLY
! 	if (verb == GENERATE) {
  		if (!pubkeyfile || !seckeyfile)
  			usage("need pubkey and seckey");
  		generate(pubkeyfile, seckeyfile, rounds, comment);
! 	} else if (verb == INSPECT) {
  		inspect(seckeyfile, pubkeyfile, sigfile);
! 	} else
  #endif
! 	{
! 		if (!msgfile)
! 			usage("need message");
! 
! 		if (!sigfile) {
! 			if (strcmp(msgfile, "-") == 0)
! 				errx(1, "must specify sigfile with - message");
! 			if (snprintf(sigfilebuf, sizeof(sigfilebuf), "%s.sig",
! 			    msgfile) >= sizeof(sigfilebuf))
! 				errx(1, "path too long");
! 			sigfile = sigfilebuf;
! 		}
! #ifndef VERIFYONLY
! 		if (verb == SIGN) {
! 			if (!seckeyfile)
! 				usage("need seckey");
! 			sign(seckeyfile, msgfile, sigfile, embedded);
! 		} else
! #endif
! 		if (verb == VERIFY) {
! 			if (!pubkeyfile)
! 				usage("need pubkey");
! 			verify(pubkeyfile, msgfile, sigfile, embedded);
! 		}
  	}
  
  	return 0;
--- 519,557 ----
  	if (argc != 0)
  		usage(NULL);
  
! 	if (!sigfile && msgfile) {
! 		if (strcmp(msgfile, "-") == 0)
! 			errx(1, "must specify sigfile with - message");
! 		if (snprintf(sigfilebuf, sizeof(sigfilebuf), "%s.sig",
! 		    msgfile) >= sizeof(sigfilebuf))
! 			errx(1, "path too long");
! 		sigfile = sigfilebuf;
! 	}
  
+ 	switch (verb) {
  #ifndef VERIFYONLY
! 	case GENERATE:
  		if (!pubkeyfile || !seckeyfile)
  			usage("need pubkey and seckey");
  		generate(pubkeyfile, seckeyfile, rounds, comment);
! 		break;
! 	case INSPECT:
  		inspect(seckeyfile, pubkeyfile, sigfile);
! 		break;
! 	case SIGN:
! 		if (!msgfile || !seckeyfile)
! 			usage("need message and seckey");
! 		sign(seckeyfile, msgfile, sigfile, embedded);
! 		break;
  #endif
! 	case VERIFY:
! 		if (!msgfile || !pubkeyfile)
! 			usage("need message and pubkey");
! 		verify(pubkeyfile, msgfile, sigfile, embedded);
! 		break;
! 	default:
! 		usage(NULL);
! 		break;
  	}
  
  	return 0;