CVS commit: src/crypto/external/bsd/netpgp/dist/src

[Alistair G. Crooks]

Module Name:    src
Committed By:   agc
Date:           Wed Jun 10 16:37:42 UTC 2009

Modified Files:
        src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
        src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c

Log Message:
Update userland programs to be able to use the "results" file


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.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/external/bsd/netpgp/dist/src/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.2	Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c	Wed Jun 10 16:37:41 2009
@@ -85,6 +85,7 @@
 	DETACHED,
 	HASH_ALG,
 	OUTPUT,
+	RESULTS,
 	VERBOSE,
 	COREDUMPS,
 	PASSWDFD,
@@ -130,6 +131,7 @@
 	{"verbose",	no_argument, 		NULL,	VERBOSE},
 	{"pass-fd",	required_argument, 	NULL,	PASSWDFD},
 	{"output",	required_argument, 	NULL,	OUTPUT},
+	{"results",	required_argument, 	NULL,	RESULTS},
 	{ NULL,		0,			NULL,	0},
 };
 
@@ -343,6 +345,14 @@
 			}
 			p.output = strdup(optarg);
 			break;
+		case RESULTS:
+			if (optarg == NULL) {
+				(void) fprintf(stderr,
+				"No output filename argument provided\n");
+				exit(EXIT_ERROR);
+			}
+			netpgp_setvar(&netpgp, "results", optarg);
+			break;
 		case OPS_DEBUG:
 			netpgp_set_debug(optarg);
 			break;

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c:1.1	Wed Jun 10 00:38:10 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c	Wed Jun 10 16:37:42 2009
@@ -79,6 +79,7 @@
 	VERBOSE,
 	COREDUMPS,
 	PASSWDFD,
+	RESULTS,
 
 	/* debug */
 	OPS_DEBUG
@@ -107,6 +108,7 @@
 	{"numbits",	required_argument, 	NULL,	NUMBITS},
 	{"verbose",	no_argument, 		NULL,	VERBOSE},
 	{"pass-fd",	required_argument, 	NULL,	PASSWDFD},
+	{"results",	required_argument, 	NULL,	RESULTS},
 	{ NULL,		0,			NULL,	0},
 };
 
@@ -292,6 +294,14 @@
 			}
 			netpgp_setvar(&netpgp, "pass-fd", optarg);
 			break;
+		case RESULTS:
+			if (optarg == NULL) {
+				(void) fprintf(stderr,
+				"No output filename argument provided\n");
+				exit(EXIT_ERROR);
+			}
+			netpgp_setvar(&netpgp, "results", optarg);
+			break;
 		case OPS_DEBUG:
 			netpgp_set_debug(optarg);
 			break;