D26321.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26321.diff
View Options

	Index: head/usr.sbin/fmtree/Makefile
	===================================================================
	--- head/usr.sbin/fmtree/Makefile
	+++ head/usr.sbin/fmtree/Makefile
	@@ -10,7 +10,7 @@
	SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
	SRCS+= specspec.c

	-CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
	+CFLAGS+= -DWITH_MD5 -DWITH_SHA1 -DWITH_RMD160 -DWITH_SHA256
	LIBADD= md

	CLEANFILES+= fmtree.8
	Index: head/usr.sbin/fmtree/compare.c
	===================================================================
	--- head/usr.sbin/fmtree/compare.c
	+++ head/usr.sbin/fmtree/compare.c
	@@ -43,16 +43,16 @@
	#include <errno.h>
	#include <fcntl.h>
	#include <fts.h>
	-#ifdef MD5
	+#ifdef WITH_MD5
	#include <md5.h>
	#endif
	-#ifdef RMD160
	+#ifdef WITH_RMD160
	#include <ripemd.h>
	#endif
	-#ifdef SHA1
	+#ifdef WITH_SHA1
	#include <sha.h>
	#endif
	-#ifdef SHA256
	+#ifdef WITH_SHA256
	#include <sha256.h>
	#endif
	#include <stdint.h>
	@@ -244,7 +244,7 @@
	(void)printf("\n");
	tab = "\t";
	}
	-#ifdef MD5
	+#ifdef WITH_MD5
	if (s->flags & F_MD5) {
	char *new_digest, buf[33];

	@@ -262,7 +262,7 @@
	}
	}
	#endif /* MD5 */
	-#ifdef SHA1
	+#ifdef WITH_SHA1
	if (s->flags & F_SHA1) {
	char *new_digest, buf[41];

	@@ -280,7 +280,7 @@
	}
	}
	#endif /* SHA1 */
	-#ifdef RMD160
	+#ifdef WITH_RMD160
	if (s->flags & F_RMD160) {
	char *new_digest, buf[41];

	@@ -298,7 +298,7 @@
	}
	}
	#endif /* RMD160 */
	-#ifdef SHA256
	+#ifdef WITH_SHA256
	if (s->flags & F_SHA256) {
	char *new_digest, buf[65];