- e = ee;
- } else if (strcmp(q, "escape") == 0)
- f |= f_escape;
- continue;
- }
-
- /* --- Otherwise it's a hex thing --- */
-
- q = p;
- while (*p && *p != ' ')
- p++;
- if (!*p)
- continue;
- *p++ = 0;
- if (e->get(q, buf, gch->hashsz, 0) < gch->hashsz)
- continue;
- if (*p == '*')
- ff |= FHF_BINARY;
- else if (*p != ' ')
- continue;
- p++;
-
- if (f & f_escape) {
- DRESET(&dd);
- getstring(&p, &dd, GSF_STRING);
- p = dd.buf;
- }
-
- if (fhash(gch, ff, p, buf + gch->hashsz)) {
- moan("couldn't read `%s': %s", p, strerror(errno));
- rc = EXIT_FAILURE;
- continue;
- }
- if (memcmp(buf, buf + gch->hashsz, gch->hashsz) != 0) {
- if (ff & f_verbose)
- fprintf(stderr, "FAIL %s\n", p);
- else
- moan("%s check failed for `%s'", gch->name, p);
- nfail++;
- rc = EXIT_FAILURE;
- } else {
- if (ff & f_verbose)
- fprintf(stderr, "OK %s\n", p);
+ }
+ if (memcmp(hfp.hbuf, hfp.hbuf + hfp.gch->hashsz,
+ hfp.gch->hashsz) != 0) {
+ if (hfp.f & f_verbose)
+ fprintf(stderr, "FAIL %s\n", df.buf);
+ else
+ moan("%s check failed for `%s'", hfp.gch->name, df.buf);
+ nfail++;
+ rc = EXIT_FAILURE;
+ } else {
+ if (hfp.f & f_verbose)
+ fprintf(stderr, "OK %s\n", df.buf);
+ }
+ n++;