~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base/asm-common.h (x86), and knock-on: Add macros for full-size regs.
[catacomb]
/
progs
/
catsign.c
diff --git
a/progs/catsign.c
b/progs/catsign.c
index
3cce9c9
..
d27016f
100644
(file)
--- a/
progs/catsign.c
+++ b/
progs/catsign.c
@@
-161,7
+161,7
@@
static size_t textread(msgcanon *m, void *bp)
if (n >= MSGBUFTHRESH) goto full;
b[n++] = ch;
f &= ~F_MIDLINE;
if (n >= MSGBUFTHRESH) goto full;
b[n++] = ch;
f &= ~F_MIDLINE;
- } else if (
isspace
(ch)) {
+ } else if (
ISSPACE
(ch)) {
f |= F_MIDLINE;
if (n >= MSGBUFSZ) goto full;
b[n++] = ch; nsp++;
f |= F_MIDLINE;
if (n >= MSGBUFSZ) goto full;
b[n++] = ch; nsp++;
@@
-222,7
+222,7
@@
static void nullwrite(msgcanon *m, const void *bp, size_t n) { ; }
static void mcsetup_readfile(msgcanon *m, unsigned f, const char *fn)
{
m->f = F_DETACH | (f & (F_BINARY | F_PROGRESS));
static void mcsetup_readfile(msgcanon *m, unsigned f, const char *fn)
{
m->f = F_DETACH | (f & (F_BINARY | F_PROGRESS));
- if (!fn ||
strcmp(fn, "-") == 0
) {
+ if (!fn ||
STRCMP(fn, ==, "-")
) {
m->fp = stdin;
m->f |= F_NOCLOSE;
} else if ((m->fp = fopen(fn, (f & F_BINARY) ? "rb" : "r")) == 0)
m->fp = stdin;
m->f |= F_NOCLOSE;
} else if ((m->fp = fopen(fn, (f & F_BINARY) ? "rb" : "r")) == 0)
@@
-260,7
+260,7
@@
static void mcsetup_read(msgcanon *m, unsigned f, enc **ee,
}
} else {
m->read = binreaddetach;
}
} else {
m->read = binreaddetach;
- if (!dfn ||
strcmp(dfn, "-") == 0
)
+ if (!dfn ||
STRCMP(dfn, ==, "-")
)
m->fp = stdin;
else if ((m->fp = fopen(dfn, "rb")) == 0)
die(EXIT_FAILURE, "can't open `%s': %s", dfn, strerror(errno));
m->fp = stdin;
else if ((m->fp = fopen(dfn, "rb")) == 0)
die(EXIT_FAILURE, "can't open `%s': %s", dfn, strerror(errno));
@@
-288,7
+288,7
@@
static void mcsetup_read(msgcanon *m, unsigned f, enc **ee,
}
}
} else {
}
}
} else {
- if (!dfn ||
strcmp(dfn, "-") == 0
)
+ if (!dfn ||
STRCMP(dfn, ==, "-")
)
m->fp = stdin;
else if ((m->fp = fopen(dfn, "r")) == 0)
die(EXIT_FAILURE, "can't read file `%s': %s", dfn, strerror(errno));
m->fp = stdin;
else if ((m->fp = fopen(dfn, "r")) == 0)
die(EXIT_FAILURE, "can't read file `%s': %s", dfn, strerror(errno));
@@
-533,7
+533,7
@@
static int sign(int argc, char *argv[])
fn = (optind >= argc) ? 0 : argv[optind++];
fn = (optind >= argc) ? 0 : argv[optind++];
- if (!of ||
strcmp(of, "-") == 0
)
+ if (!of ||
STRCMP(of, ==, "-")
)
ofp = stdout;
else if ((ofp = fopen(of, eo->wmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
ofp = stdout;
else if ((ofp = fopen(of, eo->wmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
@@
-599,14
+599,14
@@
static int vrfbdry(const char *b, void *p)
{
vrfctx *v = p;
{
vrfctx *v = p;
- if (
strcmp(b, "CATSIGN MESSAGE") == 0
) {
+ if (
STRCMP(b, ==, "CATSIGN MESSAGE")
) {
v->f |= F_BINARY;
v->m |= F_BINARY | F_DETACH;
return (1);
v->f |= F_BINARY;
v->m |= F_BINARY | F_DETACH;
return (1);
- } else if (
strcmp(b, "CATSIGN MESSAGE HEADER") == 0
) {
+ } else if (
STRCMP(b, ==, "CATSIGN MESSAGE HEADER")
) {
v->m |= F_BINARY | F_DETACH;
return (1);
v->m |= F_BINARY | F_DETACH;
return (1);
- } else if (
strcmp(b, "CATSIGN SIGNATURE") == 0
) {
+ } else if (
STRCMP(b, ==, "CATSIGN SIGNATURE")
) {
v->f |= F_DETACH;
v->m |= F_DETACH;
return (1);
v->f |= F_DETACH;
v->m |= F_DETACH;
return (1);
@@
-668,7
+668,7
@@
static int verify(int argc, char *argv[])
case 'u': v.f |= F_UTC; break;
case 'C': v.f |= F_NOCHECK; break;
case 't':
case 'u': v.f |= F_UTC; break;
case 'C': v.f |= F_NOCHECK; break;
case 't':
- if (
strcmp(optarg, "always") == 0
) t_fresh = 0;
+ if (
STRCMP(optarg, ==, "always")
) t_fresh = 0;
else if ((t_fresh = get_date(optarg, 0)) < 0)
die(EXIT_FAILURE, "bad freshness time");
break;
else if ((t_fresh = get_date(optarg, 0)) < 0)
die(EXIT_FAILURE, "bad freshness time");
break;
@@
-685,7
+685,7
@@
static int verify(int argc, char *argv[])
die(EXIT_FAILURE, "encoding `%s' not found", ef);
fn = optind < argc ? argv[optind++] : "-";
die(EXIT_FAILURE, "encoding `%s' not found", ef);
fn = optind < argc ? argv[optind++] : "-";
- if (
strcmp(fn, "-") == 0
)
+ if (
STRCMP(fn, ==, "-")
)
fp = stdin;
else if ((fp = fopen(fn, eo->rmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s': %s",
fp = stdin;
else if ((fp = fopen(fn, eo->rmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s': %s",
@@
-730,7
+730,7
@@
static int verify(int argc, char *argv[])
printf("WARN verification key %s fails check: %s\n", d.buf, err);
dstr_reset(&dd); keyhash(k, s.s, &dd);
printf("WARN verification key %s fails check: %s\n", d.buf, err);
dstr_reset(&dd); keyhash(k, s.s, &dd);
- if (dd.len != s.kh.len ||
memcmp(dd.buf, s.kh.buf, dd.len) != 0
) {
+ if (dd.len != s.kh.len ||
MEMCMP(dd.buf, !=, s.kh.buf, dd.len)
) {
if (v.verb) printf("FAIL key hash mismatch\n");
exit(EXIT_FAILURE);
}
if (v.verb) printf("FAIL key hash mismatch\n");
exit(EXIT_FAILURE);
}
@@
-746,7
+746,7
@@
static int verify(int argc, char *argv[])
if (!of && (v.f & F_DETACH)) {
rfp = ofp = 0;
v.f &= ~F_BUFFER;
if (!of && (v.f & F_DETACH)) {
rfp = ofp = 0;
v.f &= ~F_BUFFER;
- } else if (!of ||
strcmp(of, "-") == 0
) {
+ } else if (!of ||
STRCMP(of, ==, "-")
) {
v.f |= F_BUFFER;
ofp = stdout;
} else if (of && !(v.f & F_BUFFER)) {
v.f |= F_BUFFER;
ofp = stdout;
} else if (of && !(v.f & F_BUFFER)) {
@@
-893,7
+893,7
@@
static int format(int argc, char *argv[])
die(EXIT_FAILURE, "encoding `%s' not found", oef);
fn = optind < argc ? argv[optind++] : "-";
die(EXIT_FAILURE, "encoding `%s' not found", oef);
fn = optind < argc ? argv[optind++] : "-";
- if (
strcmp(fn, "-") == 0
)
+ if (
STRCMP(fn, ==, "-")
)
fp = stdin;
else if ((fp = fopen(fn, ieo->rmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s': %s",
fp = stdin;
else if ((fp = fopen(fn, ieo->rmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s': %s",
@@
-927,7
+927,7
@@
static int format(int argc, char *argv[])
if (!of)
mcsetup_writenull(&mc_out);
else {
if (!of)
mcsetup_writenull(&mc_out);
else {
- if (
strcmp(of, "-") == 0
)
+ if (
STRCMP(of, ==, "-")
)
ofp = stdout;
else if ((ofp = fopen(of, oeo->wmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
ofp = stdout;
else if ((ofp = fopen(of, oeo->wmode)) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
@@
-942,7
+942,7
@@
static int format(int argc, char *argv[])
}
if (mf) {
}
if (mf) {
- if (
strcmp(mf, "-") == 0
)
+ if (
STRCMP(mf, ==, "-")
)
mfp = stdout;
else if ((mfp = fopen(mf, (f & F_BINARY) ? "wb" : "w")) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
mfp = stdout;
else if ((mfp = fopen(mf, (f & F_BINARY) ? "wb" : "w")) == 0) {
die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
@@
-1037,7
+1037,7
@@
static int info(int argc, char *argv[])
if (optind >= argc)
fp = stdin;
if (optind >= argc)
fp = stdin;
- else if (
strcmp(argv[optind], "-") == 0
) {
+ else if (
STRCMP(argv[optind], ==, "-")
) {
fp = stdin;
optind++;
} else if ((fp = fopen(argv[optind], eo->rmode)) == 0) {
fp = stdin;
optind++;
} else if ((fp = fopen(argv[optind], eo->rmode)) == 0) {