===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.75.2.1
retrieving revision 1.76
diff -u -r1.75.2.1 -r1.76
--- src/usr.bin/ssh/ssh-add.c	2006/09/30 04:06:51	1.75.2.1
+++ src/usr.bin/ssh/ssh-add.c	2006/03/13 10:26:52	1.76
@@ -1,4 +1,3 @@
-/* $OpenBSD: ssh-add.c,v 1.75.2.1 2006/09/30 04:06:51 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,25 +34,19 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "includes.h"
+RCSID("$OpenBSD: ssh-add.c,v 1.76 2006/03/13 10:26:52 dtucker Exp $");
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 
 #include <openssl/evp.h>
 
-#include <fcntl.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "xmalloc.h"
 #include "ssh.h"
 #include "rsa.h"
 #include "log.h"
+#include "xmalloc.h"
 #include "key.h"
-#include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
 #include "pathnames.h"
@@ -139,7 +132,7 @@
 	char msg[1024];
 	int fd, perms_ok, ret = -1;
 
-	if ((fd = open(filename, O_RDONLY)) < 0) {
+	if ((fd = open(filename, 0)) < 0) {
 		perror(filename);
 		return -1;
 	}
@@ -306,7 +299,7 @@
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname);
+	fprintf(stderr, "Usage: %s [options]\n", __progname);
 	fprintf(stderr, "Options:\n");
 	fprintf(stderr, "  -l          List fingerprints of all identities.\n");
 	fprintf(stderr, "  -L          List public key parameters of all identities.\n");
@@ -350,11 +343,13 @@
 			if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
 				ret = 1;
 			goto done;
+			break;
 		case 'x':
 		case 'X':
 			if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
 				ret = 1;
 			goto done;
+			break;
 		case 'c':
 			confirm = 1;
 			break;
@@ -365,6 +360,7 @@
 			if (delete_all(ac) == -1)
 				ret = 1;
 			goto done;
+			break;
 		case 's':
 			sc_reader_id = optarg;
 			break;