Module Name: src
Committed By: christos
Date: Fri Jun 14 16:29:14 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: setkey.c
Log Message:
Accept - as stdin
Be nice and let the user know which file it could not open.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/crypto/dist/ipsec-tools/src/setkey/setkey.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.c
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.15 src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.16
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.15 Fri May 27 14:00:21 2011
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.c Fri Jun 14 12:29:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setkey.c,v 1.15 2011/05/27 18:00:21 drochner Exp $ */
+/* $NetBSD: setkey.c,v 1.16 2013/06/14 16:29:14 christos Exp $ */
/* $KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $ */
@@ -165,8 +165,10 @@ main(argc, argv)
break;
case 'f':
f_mode = MODE_SCRIPT;
- if ((fp = fopen(optarg, "r")) == NULL) {
- err(1, "fopen");
+ if (strcmp(optarg, "-") == 0)
+ fp = stdin;
+ else if ((fp = fopen(optarg, "r")) == NULL) {
+ err(1, "Can't open `%s'", optarg);
/*NOTREACHED*/
}
break;
