diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c
index 0e9beb80e6a1..489b873e2fcf 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -1,379 +1,393 @@
 /*	$OpenBSD: diffdir.c,v 1.45 2015/10/05 20:15:00 millert Exp $	*/
 
 /*
  * Copyright (c) 2003, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
 #include <sys/stat.h>
 #include <sys/tree.h>
 
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "diff.h"
 
 static int selectfile(const struct dirent *);
 static void diffit(struct dirent *, char *, size_t, struct dirent *,
 	char *, size_t, int);
 static void print_only(const char *, size_t, const char *);
 
 struct inode {
 	dev_t dev;
 	ino_t ino;
 	RB_ENTRY(inode) entry;
 };
 
 static int
 inodecmp(struct inode *a, struct inode *b)
 {
 	return (a->dev < b->dev ? -1 : a->dev > b->dev ? 1 :
 	    a->ino < b->ino ? -1 : a->ino > b->ino ? 1 : 0);
 }
 
 RB_HEAD(inodetree, inode);
 static struct inodetree v1 = RB_INITIALIZER(&v1);
 static struct inodetree v2 = RB_INITIALIZER(&v2);
 RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp);
 
 static int
-vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp,
+vscandir(struct inodetree *tree, struct inode **inop,
+    const char *path, struct dirent ***dirp,
     int (*selectf)(const struct dirent *),
     int (*comparf)(const struct dirent **, const struct dirent **))
 {
 	struct stat sb;
 	struct inode *ino = NULL;
 	int fd = -1, ret, serrno;
 
 	if ((fd = open(path, O_DIRECTORY | O_RDONLY)) < 0 ||
 	    (ino = calloc(1, sizeof(*ino))) == NULL ||
 	    fstat(fd, &sb) != 0)
 		goto fail;
 	ino->dev = sb.st_dev;
 	ino->ino = sb.st_ino;
 	if (RB_FIND(inodetree, tree, ino)) {
 		free(ino);
 		close(fd);
 		warnx("%s: Directory loop detected", path);
 		*dirp = NULL;
 		return (0);
 	}
 	if ((ret = fdscandir(fd, dirp, selectf, comparf)) < 0)
 		goto fail;
 	RB_INSERT(inodetree, tree, ino);
 	close(fd);
+	*inop = ino;
 	return (ret);
 fail:
 	serrno = errno;
 	if (ino != NULL)
 		free(ino);
 	if (fd >= 0)
 		close(fd);
 	errno = serrno;
 	return (-1);
 }
 
+static void
+leavedir(struct inodetree *tree, struct inode *ino)
+{
+	RB_REMOVE(inodetree, tree, ino);
+	free(ino);
+}
+
 /*
  * Diff directory traversal. Will be called recursively if -r was specified.
  */
 void
 diffdir(char *p1, char *p2, int flags)
 {
 	struct dirent *dent1, **dp1, **edp1, **dirp1 = NULL;
 	struct dirent *dent2, **dp2, **edp2, **dirp2 = NULL;
+	struct inode *ino1 = NULL, *ino2 = NULL;
 	size_t dirlen1, dirlen2;
 	char path1[PATH_MAX], path2[PATH_MAX];
 	int pos;
 
 	edp1 = edp2 = NULL;
 
 	dirlen1 = strlcpy(path1, *p1 ? p1 : ".", sizeof(path1));
 	if (dirlen1 >= sizeof(path1) - 1) {
 		warnc(ENAMETOOLONG, "%s", p1);
 		status |= 2;
 		return;
 	}
 	while (dirlen1 > 1 && path1[dirlen1 - 1] == '/')
 		path1[--dirlen1] = '\0';
 	dirlen2 = strlcpy(path2, *p2 ? p2 : ".", sizeof(path2));
 	if (dirlen2 >= sizeof(path2) - 1) {
 		warnc(ENAMETOOLONG, "%s", p2);
 		status |= 2;
 		return;
 	}
 	while (dirlen2 > 1 && path2[dirlen2 - 1] == '/')
 		path2[--dirlen2] = '\0';
 
 	/*
 	 * Get a list of entries in each directory, skipping "excluded" files
 	 * and sorting alphabetically.
 	 */
-	pos = vscandir(&v1, path1, &dirp1, selectfile, alphasort);
+	pos = vscandir(&v1, &ino1, path1, &dirp1, selectfile, alphasort);
 	if (pos == -1) {
 		if (errno == ENOENT && (Nflag || Pflag)) {
 			pos = 0;
 		} else {
 			warn("%s", path1);
 			goto closem;
 		}
 	}
 	dp1 = dirp1;
 	edp1 = dirp1 + pos;
 
-	pos = vscandir(&v2, path2, &dirp2, selectfile, alphasort);
+	pos = vscandir(&v2, &ino2, path2, &dirp2, selectfile, alphasort);
 	if (pos == -1) {
 		if (errno == ENOENT && Nflag) {
 			pos = 0;
 		} else {
 			warn("%s", path2);
 			goto closem;
 		}
 	}
 	dp2 = dirp2;
 	edp2 = dirp2 + pos;
 
 	/*
 	 * If we were given a starting point, find it.
 	 */
 	if (start != NULL) {
 		while (dp1 != edp1 && strcmp((*dp1)->d_name, start) < 0)
 			dp1++;
 		while (dp2 != edp2 && strcmp((*dp2)->d_name, start) < 0)
 			dp2++;
 	}
 
 	/*
 	 * Append separator so children's names can be appended directly.
 	 */
 	if (path1[dirlen1 - 1] != '/') {
 		path1[dirlen1++] = '/';
 		path1[dirlen1] = '\0';
 	}
 	if (path2[dirlen2 - 1] != '/') {
 		path2[dirlen2++] = '/';
 		path2[dirlen2] = '\0';
 	}
 
 	/*
 	 * Iterate through the two directory lists, diffing as we go.
 	 */
 	while (dp1 != edp1 || dp2 != edp2) {
 		dent1 = dp1 != edp1 ? *dp1 : NULL;
 		dent2 = dp2 != edp2 ? *dp2 : NULL;
 
 		pos = dent1 == NULL ? 1 : dent2 == NULL ? -1 :
 		    ignore_file_case ? strcasecmp(dent1->d_name, dent2->d_name) :
 		    strcmp(dent1->d_name, dent2->d_name) ;
 		if (pos == 0) {
 			/* file exists in both dirs, diff it */
 			diffit(dent1, path1, dirlen1, dent2, path2, dirlen2, flags);
 			dp1++;
 			dp2++;
 		} else if (pos < 0) {
 			/* file only in first dir, only diff if -N */
 			if (Nflag) {
 				diffit(dent1, path1, dirlen1, dent2, path2,
 					dirlen2, flags);
 			} else {
 				print_only(path1, dirlen1, dent1->d_name);
 				status |= 1;
 			}
 			dp1++;
 		} else {
 			/* file only in second dir, only diff if -N or -P */
 			if (Nflag || Pflag)
 				diffit(dent2, path1, dirlen1, dent1, path2,
 					dirlen2, flags);
 			else {
 				print_only(path2, dirlen2, dent2->d_name);
 				status |= 1;
 			}
 			dp2++;
 		}
 	}
 
 closem:
 	if (dirp1 != NULL) {
+		if (ino1 != NULL)
+			leavedir(&v1, ino1);
 		for (dp1 = dirp1; dp1 < edp1; dp1++)
 			free(*dp1);
 		free(dirp1);
 	}
 	if (dirp2 != NULL) {
+		if (ino2 != NULL)
+			leavedir(&v2, ino2);
 		for (dp2 = dirp2; dp2 < edp2; dp2++)
 			free(*dp2);
 		free(dirp2);
 	}
 }
 
 /*
  * Do the actual diff by calling either diffreg() or diffdir().
  */
 static void
 diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2,
 	char *path2, size_t plen2, int flags)
 {
 	int rc;
 
 	flags |= D_HEADER;
 	strlcpy(path1 + plen1, dp->d_name, PATH_MAX - plen1);
 
 	/*
 	 * If we are ignoring file case, use dent2s name here if both names are
 	 * the same apart from case.
 	 */
 	if (ignore_file_case && strcasecmp(dp2->d_name, dp2->d_name) == 0)
 		strlcpy(path2 + plen2, dp2->d_name, PATH_MAX - plen2);
 	else
 		strlcpy(path2 + plen2, dp->d_name, PATH_MAX - plen2);
 
 	if (noderef) {
 		if (lstat(path1, &stb1) != 0) {
 			if (!(Nflag || Pflag) || errno != ENOENT) {
 				warn("%s", path1);
 				return;
 			}
 			flags |= D_EMPTY1;
 			memset(&stb1, 0, sizeof(stb1));
 		}
 		if (lstat(path2, &stb2) != 0) {
 			if (!Nflag || errno != ENOENT) {
 				warn("%s", path2);
 				return;
 			}
 			flags |= D_EMPTY2;
 			memset(&stb2, 0, sizeof(stb2));
 			stb2.st_mode = stb1.st_mode;
 		}
 		if (stb1.st_mode == 0)
 			stb1.st_mode = stb2.st_mode;
 		if (S_ISLNK(stb1.st_mode) || S_ISLNK(stb2.st_mode)) {
 			if  (S_ISLNK(stb1.st_mode) && S_ISLNK(stb2.st_mode)) {
 				char buf1[PATH_MAX];
 				char buf2[PATH_MAX];
 				ssize_t len1 = 0;
 				ssize_t len2 = 0;
 
 				len1 = readlink(path1, buf1, sizeof(buf1));
 				len2 = readlink(path2, buf2, sizeof(buf2));
 
 				if (len1 < 0 || len2 < 0) {
 					perror("reading links");
 					return;
 				}
 				buf1[len1] = '\0';
 				buf2[len2] = '\0';
 
 				if (len1 != len2 || strncmp(buf1, buf2, len1) != 0) {
 					printf("Symbolic links %s and %s differ\n",
 						path1, path2);
 					status |= 1;
 				}
 
 				return;
 			}
 
 			printf("File %s is a %s while file %s is a %s\n",
 				path1, S_ISLNK(stb1.st_mode) ? "symbolic link" :
 					(S_ISDIR(stb1.st_mode) ? "directory" :
 					(S_ISREG(stb1.st_mode) ? "file" : "error")),
 				path2, S_ISLNK(stb2.st_mode) ? "symbolic link" :
 					(S_ISDIR(stb2.st_mode) ? "directory" :
 					(S_ISREG(stb2.st_mode) ? "file" : "error")));
 			status |= 1;
 			return;
 		}
 	} else {
 		if (stat(path1, &stb1) != 0) {
 			if (!(Nflag || Pflag) || errno != ENOENT) {
 				warn("%s", path1);
 				return;
 			}
 			flags |= D_EMPTY1;
 			memset(&stb1, 0, sizeof(stb1));
 		}
 		if (stat(path2, &stb2) != 0) {
 			if (!Nflag || errno != ENOENT) {
 				warn("%s", path2);
 				return;
 			}
 			flags |= D_EMPTY2;
 			memset(&stb2, 0, sizeof(stb2));
 			stb2.st_mode = stb1.st_mode;
 		}
 		if (stb1.st_mode == 0)
 			stb1.st_mode = stb2.st_mode;
 	}
 	if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino)
 		return;
 	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
 		if (rflag)
 			diffdir(path1, path2, flags);
 		else
 			printf("Common subdirectories: %s and %s\n",
 			    path1, path2);
 		return;
 	}
 	if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode))
 		rc = D_SKIPPED1;
 	else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode))
 		rc = D_SKIPPED2;
 	else
 		rc = diffreg(path1, path2, flags, 0);
 	print_status(rc, path1, path2, "");
 }
 
 /*
  * Returns 1 if the directory entry should be included in the
  * diff, else 0.  Checks the excludes list.
  */
 static int
 selectfile(const struct dirent *dp)
 {
 	struct excludes *excl;
 
 	if (dp->d_fileno == 0)
 		return (0);
 
 	/* always skip "." and ".." */
 	if (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' ||
 	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 		return (0);
 
 	/* check excludes list */
 	for (excl = excludes_list; excl != NULL; excl = excl->next)
 		if (fnmatch(excl->pattern, dp->d_name, FNM_PATHNAME) == 0)
 			return (0);
 
 	return (1);
 }
 
 void
 print_only(const char *path, size_t dirlen, const char *entry)
 {
 	if (dirlen > 1)
 		dirlen--;
 	printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
 }
diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh
index 6ca19a8f20cb..0d3acf50edf9 100755
--- a/usr.bin/diff/tests/diff_test.sh
+++ b/usr.bin/diff/tests/diff_test.sh
@@ -1,487 +1,492 @@
 
 atf_test_case simple
 atf_test_case unified
 atf_test_case header
 atf_test_case header_ns
 atf_test_case ifdef
 atf_test_case group_format
 atf_test_case side_by_side
 atf_test_case side_by_side_tabbed
 atf_test_case brief_format
 atf_test_case b230049
 atf_test_case stripcr_o
 atf_test_case b252515
 atf_test_case b278988
 atf_test_case Bflag
 atf_test_case Nflag
 atf_test_case tabsize
 atf_test_case conflicting_format
 atf_test_case label
 atf_test_case report_identical
 atf_test_case non_regular_file
 atf_test_case binary
 atf_test_case functionname
 atf_test_case noderef
 atf_test_case ignorecase
 atf_test_case dirloop
 atf_test_case bigc
 atf_test_case bigu
 atf_test_case prleak
 atf_test_case same
 
 simple_body()
 {
 	atf_check -o file:$(atf_get_srcdir)/simple.out -s eq:1 \
 		diff "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_e.out -s eq:1 \
 		diff -e "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_u.out -s eq:1 \
 		diff -u -L input1 -L input2 "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_n.out -s eq:1 \
 		diff -n "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
 
 	atf_check -o inline:"Files $(atf_get_srcdir)/input1.in and $(atf_get_srcdir)/input2.in differ\n" -s eq:1 \
 		diff -q "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
 
 	atf_check \
 		diff -q "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input1.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_i.out -s eq:1 \
 		diff -i "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_w.out -s eq:1 \
 		diff -w "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_b.out -s eq:1 \
 		diff -b "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 
 	atf_check -o file:$(atf_get_srcdir)/simple_p.out -s eq:1 \
 		diff --label input_c1.in --label input_c2.in -p "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 }
 
 unified_body()
 {
 	atf_check -o file:$(atf_get_srcdir)/unified_p.out -s eq:1 \
 		diff -up -L input_c1.in -L input_c2.in  "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 	atf_check -o file:$(atf_get_srcdir)/unified_9999.out -s eq:1 \
 		diff -u9999 -L input_c1.in -L input_c2.in "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 }
 
 b230049_body()
 {
 	printf 'a\nb\r\nc\n' > b230049_a.in
 	printf 'a\r\nb\r\nc\r\n' > b230049_b.in
 	atf_check -o empty -s eq:0 \
 		diff -up --strip-trailing-cr -L b230049_a.in -L b230049_b.in \
 		    b230049_a.in b230049_b.in
 }
 
 stripcr_o_body()
 {
 	printf 'a\nX\nc\n' > stripcr_o_X.in
 	printf 'a\r\nY\r\nc\r\n' > stripcr_o_Y.in
 	atf_check -o "file:$(atf_get_srcdir)/strip_o.out" -s eq:1 \
 		diff -L1 -L2 -u --strip-trailing-cr stripcr_o_X.in stripcr_o_Y.in
 }
 
 b252515_body()
 {
 	printf 'a b\n' > b252515_a.in
 	printf 'a  b\n' > b252515_b.in
 	atf_check -o empty -s eq:0 \
 		diff -qw b252515_a.in b252515_b.in
 }
 
 b278988_body()
 {
 	printf 'a\nb\nn' > b278988.a.in
 	printf 'a\n\nb\nn' > b278988.b.in
 	atf_check -o empty -s eq:0 \
 		diff -Bw b278988.a.in b278988.b.in
 }
 
 header_body()
 {
 	export TZ=UTC
 	: > empty
 	echo hello > hello
 	touch -d 2015-04-03T01:02:03 empty
 	touch -d 2016-12-22T11:22:33 hello
 	atf_check -o "file:$(atf_get_srcdir)/header.out" -s eq:1 \
 		diff -u empty hello
 }
 
 header_ns_body()
 {
 	export TZ=UTC
 	: > empty
 	echo hello > hello
 	touch -d 2015-04-03T01:02:03.123456789 empty
 	touch -d 2016-12-22T11:22:33.987654321 hello
 	atf_check -o "file:$(atf_get_srcdir)/header_ns.out" -s eq:1 \
 		diff -u empty hello
 }
 
 ifdef_body()
 {
 	atf_check -o file:$(atf_get_srcdir)/ifdef.out -s eq:1 \
 		diff -D PLOP "$(atf_get_srcdir)/input_c1.in" \
 		"$(atf_get_srcdir)/input_c2.in"
 }
 
 group_format_body()
 {
 	atf_check -o file:$(atf_get_srcdir)/group-format.out -s eq:1 \
 		diff --changed-group-format='<<<<<<< (local)
 %<=======
 %>>>>>>>> (stock)
 ' "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
 }
 
 side_by_side_body()
 {
 	atf_check -o save:A printf "A\nB\nC\n"
 	atf_check -o save:B printf "D\nB\nE\n"
 
 	exp_output=$(printf "A[[:space:]]+|[[:space:]]+D\nB[[:space:]]+B\nC[[:space:]]+|[[:space:]]+E")
 	exp_output_suppressed=$(printf "A[[:space:]]+|[[:space:]]+D\nC[[:space:]]+|[[:space:]]+E")
 
 	atf_check -o match:"$exp_output" -s exit:1 \
 	    diff --side-by-side A B
 	atf_check -o match:"$exp_output" -s exit:1 \
 	    diff -y A B
 	atf_check -o match:"$exp_output_suppressed" -s exit:1 \
 	    diff -y --suppress-common-lines A B
 	atf_check -o match:"$exp_output_suppressed" -s exit:1 \
 	    diff -W 65 -y --suppress-common-lines A B
 }
 
 side_by_side_tabbed_body()
 {
 	file_a=$(atf_get_srcdir)/side_by_side_tabbed_a.in
 	file_b=$(atf_get_srcdir)/side_by_side_tabbed_b.in
 
 	atf_check -o save:diffout -s not-exit:0 \
 	    diff -y ${file_a} ${file_b}
 	atf_check -o save:diffout_expanded -s not-exit:0 \
 	    diff -yt ${file_a} ${file_b}
 
 	atf_check -o not-empty grep -Ee 'file A.+file B' diffout
 	atf_check -o not-empty grep -Ee 'file A.+file B' diffout_expanded
 
 	atf_check -o not-empty grep -Ee 'tabs.+tabs' diffout
 	atf_check -o not-empty grep -Ee 'tabs.+tabs' diffout_expanded
 }
 
 brief_format_body()
 {
 	atf_check mkdir A B
 
 	atf_check -x "echo 1 > A/test-file"
 	atf_check -x "echo 2 > B/test-file"
 
 	atf_check cp -Rf A C
 	atf_check cp -Rf A D
 
 	atf_check -x "echo 3 > D/another-test-file"
 
 	atf_check \
 	    -s exit:1 \
 	    -o inline:"Files A/test-file and B/test-file differ\n" \
 	    diff -rq A B
 
 	atf_check diff -rq A C
 
 	atf_check \
 	    -s exit:1 \
 	    -o inline:"Only in D: another-test-file\n" \
 	    diff -rq A D
 
 	atf_check \
 	    -s exit:1 \
 	    -o inline:"Files A/another-test-file and D/another-test-file differ\n" \
 	    diff -Nrq A D
 }
 
 Bflag_body()
 {
 	atf_check -x 'printf "A\nB\n" > A'
 	atf_check -x 'printf "A\n\nB\n" > B'
 	atf_check -x 'printf "A\n \nB\n" > C'
 	atf_check -x 'printf "A\nC\nB\n" > D'
 	atf_check -x 'printf "A\nB\nC\nD\nE\nF\nG\nH" > E'
 	atf_check -x 'printf "A\n\nB\nC\nD\nE\nF\nX\nH" > F'
 
 	atf_check -s exit:0 -o inline:"" diff -B A B
 	atf_check -s exit:1 -o file:"$(atf_get_srcdir)/Bflag_C.out" diff -B A C
 	atf_check -s exit:1 -o file:"$(atf_get_srcdir)/Bflag_D.out" diff -B A D
 	atf_check -s exit:1 -o file:"$(atf_get_srcdir)/Bflag_F.out" diff -B E F
 }
 
 Nflag_body()
 {
 	atf_check -x 'printf "foo" > A'
 
 	atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE 
 	atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A 
 	atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 
 }
 
 tabsize_body()
 {
 	printf "\tA\n" > A
 	printf "\tB\n" > B
 
 	atf_check -s exit:1 \
 	    -o inline:"1c1\n<  A\n---\n>  B\n" \
 	    diff -t --tabsize 1 A B
 }
 
 conflicting_format_body()
 {
 	printf "\tA\n" > A
 	printf "\tB\n" > B
 
 	atf_check -s exit:2 -e ignore diff -c -u A B
 	atf_check -s exit:2 -e ignore diff -e -f A B
 	atf_check -s exit:2 -e ignore diff -y -q A B
 	atf_check -s exit:2 -e ignore diff -q -u A B
 	atf_check -s exit:2 -e ignore diff -q -c A B
 	atf_check -s exit:2 -e ignore diff --normal -c A B
 	atf_check -s exit:2 -e ignore diff -c --normal A B
 
 	atf_check -s exit:1 -o ignore -e ignore diff -u -u A B
 	atf_check -s exit:1 -o ignore -e ignore diff -e -e A B
 	atf_check -s exit:1 -o ignore -e ignore diff -y -y A B
 	atf_check -s exit:1 -o ignore -e ignore diff -q -q A B
 	atf_check -s exit:1 -o ignore -e ignore diff -c -c A B
 	atf_check -s exit:1 -o ignore -e ignore diff --normal --normal A B
 }
 
 label_body()
 {
 	printf "\tA\n" > A
 
 	atf_check -o inline:"Files hello and world are identical\n" \
 		-s exit:0 diff --label hello --label world -s A A
 
 	atf_check -o inline:"Binary files hello and world differ\n" \
 		-s exit:1 diff --label hello --label world `which diff` `which ls`
 }
 
 report_identical_head()
 {
 	atf_set "require.user" unprivileged
 }
 report_identical_body()
 {
 	printf "\tA\n" > A
 	printf "\tB\n" > B
 	atf_check -s exit:0 -o match:"are identical" \
 		  diff -s A A
 	atf_check -s exit:1 -o not-match:"are identical" \
 		  diff -s A B
 	chmod -r B
 	atf_check -s exit:2 -e inline:"diff: B: Permission denied\n" \
 		-o empty diff -s A B
 }
 
 non_regular_file_body()
 {
 	printf "\tA\n" > A
 	mkfifo B
 	printf "\tA\n" > B &
 
 	atf_check diff A B
 	printf "\tB\n" > B &
 	atf_check -s exit:1 \
 		-o inline:"--- A\n+++ B\n@@ -1 +1 @@\n-\tA\n+\tB\n" \
 		diff --label A --label B -u A B
 }
 
 binary_body()
 {
 	# the NUL byte has to be after at least BUFSIZ bytes to trick asciifile()
 	yes 012345678901234567890123456789012345678901234567890 | head -n 174 > A
 	cp A B
 	printf '\n\0\n' >> A
 	printf '\nx\n' >> B
 
 	atf_check -o inline:"Binary files A and B differ\n" -s exit:1 diff A B
 	atf_check -o inline:"176c\nx\n.\n" -s exit:1 diff -ae A B
 }
 
 functionname_body()
 {
 	atf_check -o file:$(atf_get_srcdir)/functionname_c.out -s exit:1 \
 		diff -u -p -L functionname.in -L functionname_c.in \
 		"$(atf_get_srcdir)/functionname.in" "$(atf_get_srcdir)/functionname_c.in"
 
 	atf_check -o file:$(atf_get_srcdir)/functionname_objcm.out -s exit:1 \
 		diff -u -p -L functionname.in -L functionname_objcm.in \
 		"$(atf_get_srcdir)/functionname.in" "$(atf_get_srcdir)/functionname_objcm.in"
 
 	atf_check -o file:$(atf_get_srcdir)/functionname_objcclassm.out -s exit:1 \
 		diff -u -p -L functionname.in -L functionname_objcclassm.in \
 		"$(atf_get_srcdir)/functionname.in" "$(atf_get_srcdir)/functionname_objcclassm.in"
 }
 
 noderef_body()
 {
 	atf_check mkdir A B
 
 	atf_check -x "echo 1 > A/test-file"
 	atf_check -x "echo 1 > test-file"
 	atf_check -x "echo 1 > test-file2"
 
 	atf_check ln -s $(pwd)/test-file B/test-file
 
 	atf_check -o empty -s exit:0 diff -r A B
 	atf_check -o inline:"File A/test-file is a file while file B/test-file is a symbolic link\n" \
 		-s exit:1 diff -r --no-dereference A B
 
 	# both test files are now the same symbolic link
 	atf_check rm A/test-file
 
 	atf_check ln -s $(pwd)/test-file A/test-file
 	atf_check -o empty -s exit:0 diff -r A B
 	atf_check -o empty -s exit:0 diff -r --no-dereference A B
 
 	# make test files different symbolic links, but same contents
 	atf_check unlink A/test-file
 	atf_check ln -s $(pwd)/test-file2 A/test-file
 
 	atf_check -o empty -s exit:0 diff -r A B
 	atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff -r --no-dereference A B
 }
 
 ignorecase_body()
 {
 	atf_check mkdir A
 	atf_check mkdir B
 
 	atf_check -x "echo hello > A/foo"
 	atf_check -x "echo hello > B/FOO"
 
 	atf_check -o empty -s exit:0 diff -u -r --ignore-file-name-case A B
 }
 
 dirloop_head()
 {
 	atf_set "timeout" "10"
 }
 dirloop_body()
 {
 	atf_check mkdir -p a/foo/bar
 	atf_check ln -s .. a/foo/bar/up
 	atf_check cp -a a b
 	atf_check \
 	    -e match:"a/foo/bar/up: Directory loop detected" \
 	    -e match:"b/foo/bar/up: Directory loop detected" \
 	    diff -r a b
+	atf_check rm [ab]/foo/bar/up
+	atf_check mkdir -p b/foo/bar
+	atf_check ln -s foo a/baz
+	atf_check ln -s foo b/baz
+	atf_check diff -r a b
 }
 
 bigc_head()
 {
 	atf_set "descr" "Context diff with very large context"
 }
 bigc_body()
 {
 	echo $'x\na\ny' >a
 	echo $'x\nb\ny' >b
 	atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b
 	atf_check -s exit:1 -o match:'--- 1,3 ---' \
 	    diff -C$(((1<<31)-2)) a b
 	atf_check -s exit:1 -o match:'--- 1,3 ---' \
 	    diff -Astone -C$(((1<<31)-2)) a b
 }
 
 bigu_head()
 {
 	atf_set "descr" "Unified diff with very large context"
 }
 bigu_body()
 {
 	echo $'x\na\ny' >a
 	echo $'x\nb\ny' >b
 	atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b
 	atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \
 	    diff -U$(((1<<31)-2)) a b
 	atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \
 	    diff -Astone -U$(((1<<31)-2)) a b
 }
 
 prleak_head()
 {
 	atf_set "descr" "Verify that pagination does not leak resources"
 }
 prleak_body()
 {
 	local n=32
 	mkdir a b
 	for hi in $(jot -w%02x $n 0) ; do
 		mkdir a/$hi b/$hi
 		for lo in $(jot -w%02x $n 0) ; do
 			echo "$hi$lo" >a/$hi/$lo
 			echo "$hi$lo" >b/$hi/$lo
 		done
 	done
 	ulimit -n 1000
 	ulimit -u 1000
 	atf_check diff -rul a b
 	atf_check diff -Astone -rul a b
 }
 
 same_head()
 {
 	atf_set "descr" "Don't diff a file or directory with itself"
 }
 same_body()
 {
 	local n=256
 	mkdir a
 	for hi in $(jot -w%02x $n 0) ; do
 		mkdir a/$hi
 		for lo in $(jot -w%02x $n 0) ; do
 			echo "$hi$lo" >a/$hi/$lo
 		done
 	done
 	ln -s a b
 	atf_check timeout 1s diff -rqs a b
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case simple
 	atf_add_test_case unified
 	atf_add_test_case header
 	atf_add_test_case header_ns
 	atf_add_test_case ifdef
 	atf_add_test_case group_format
 	atf_add_test_case side_by_side
 	atf_add_test_case side_by_side_tabbed
 	atf_add_test_case brief_format
 	atf_add_test_case b230049
 	atf_add_test_case stripcr_o
 	atf_add_test_case b252515
 	atf_add_test_case b278988
 	atf_add_test_case Bflag
 	atf_add_test_case Nflag
 	atf_add_test_case tabsize
 	atf_add_test_case conflicting_format
 	atf_add_test_case label
 	atf_add_test_case report_identical
 	atf_add_test_case non_regular_file
 	atf_add_test_case binary
 	atf_add_test_case functionname
 	atf_add_test_case noderef
 	atf_add_test_case ignorecase
 	atf_add_test_case dirloop
 	atf_add_test_case bigc
 	atf_add_test_case bigu
 	atf_add_test_case prleak
 	atf_add_test_case same
 }