summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mtree
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1995-07-12 09:15:15 +0000
committerphk <phk@FreeBSD.org>1995-07-12 09:15:15 +0000
commit1b1b92f5a76f96b65368e911c49c962202b2f52e (patch)
tree4459f3ca666f4b2deefd3d5a9bd88fa996aa67f6 /usr.sbin/mtree
parenta50b55b1b322ff3c0098dec9caf402ed91f177bf (diff)
downloadFreeBSD-src-1b1b92f5a76f96b65368e911c49c962202b2f52e.zip
FreeBSD-src-1b1b92f5a76f96b65368e911c49c962202b2f52e.tar.gz
Fix to match new MD5 api, faster.
Diffstat (limited to 'usr.sbin/mtree')
-rw-r--r--usr.sbin/mtree/compare.c7
-rw-r--r--usr.sbin/mtree/create.c4
2 files changed, 4 insertions, 7 deletions
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 8d4094f..f927c32 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -202,9 +202,9 @@ typeerr: LABEL;
tab = "\t";
}
if (s->flags & F_MD5) {
- char *new_digest;
+ char *new_digest, buf[33];
- new_digest = MD5File(p->fts_accpath);
+ new_digest = MD5File(p->fts_accpath,buf);
if (!new_digest) {
LABEL;
printf("%sMD5File: %s: %s\n", tab, p->fts_accpath,
@@ -215,9 +215,6 @@ typeerr: LABEL;
printf("%sMD5 (%s, %s)\n", tab, s->md5digest,
new_digest);
tab = "\t";
- free(new_digest);
- } else {
- free(new_digest);
}
}
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 9230a15..37977b6 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -189,13 +189,13 @@ statf(indent, p)
output(indent, &offset, "cksum=%lu", val);
}
if (keys & F_MD5 && S_ISREG(p->fts_statp->st_mode)) {
- char *md5digest = MD5File(p->fts_accpath);
+ char *md5digest, buf[33];
+ md5digest = MD5File(p->fts_accpath,buf);
if (!md5digest) {
err("%s: %s", p->fts_accpath, strerror(errno));
} else {
output(indent, &offset, "md5digest=%s", md5digest);
- free(md5digest);
}
}
if (keys & F_SLINK &&
OpenPOWER on IntegriCloud