projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't print DATA when being quiet. Actually allow `-b' to `decrypt'.
[u/mdw/catacomb]
/
catcrypt.c
diff --git
a/catcrypt.c
b/catcrypt.c
index
08fbb53
..
4e54712
100644
(file)
--- a/
catcrypt.c
+++ b/
catcrypt.c
@@
-366,7
+366,7
@@
static int decrypt(int argc, char *argv[])
{ "output", OPTF_ARGREQ, 0, 'o' },
{ 0, 0, 0, 0 }
};
{ "output", OPTF_ARGREQ, 0, 'o' },
{ 0, 0, 0, 0 }
};
- i = mdwopt(argc, argv, "af:o:qv", opt, 0, 0, 0);
+ i = mdwopt(argc, argv, "a
b
f:o:qv", opt, 0, 0, 0);
if (i < 0) break;
switch (i) {
case 'a': ef = "pem"; break;
if (i < 0) break;
switch (i) {
case 'a': ef = "pem"; break;
@@
-522,7
+522,7
@@
static int decrypt(int argc, char *argv[])
rewind(rfp);
dstr_reset(&d);
dstr_ensure(&d, 65536);
rewind(rfp);
dstr_reset(&d);
dstr_ensure(&d, 65536);
- if (ofp == stdout) printf("DATA\n");
+ if (
verb &&
ofp == stdout) printf("DATA\n");
for (;;) {
n = fread(d.buf, 1, d.sz, rfp);
if (!n) break;
for (;;) {
n = fread(d.buf, 1, d.sz, rfp);
if (!n) break;