diff options
| author |   ray <ray@openbsd.org> | 2009-06-06 15:37:28 +0000 |
|---|---|---|
| committer | ray <ray@openbsd.org> | 2009-06-06 15:37:28 +0000 |
| commit | 3f8e756bb946f2b52ef7332b5732ffdc77c162bd (patch) | |
| tree | 4d0b88c4a4d006048d12767b52e0d100136d3be9 /usr.bin/diff/diff.c | |
| parent | Pull changes from rcsdiff, similar to what was pulled into cvsdiff. (diff) | |
| download | wireguard-openbsd-3f8e756bb946f2b52ef7332b5732ffdc77c162bd.tar.xz wireguard-openbsd-3f8e756bb946f2b52ef7332b5732ffdc77c162bd.zip | |
Oops, forgot to pass dflags to diffreg. Now the flags work again.
OK millert
Diffstat (limited to 'usr.bin/diff/diff.c')
| -rw-r--r-- | usr.bin/diff/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index d5dde3b9bae..373fe43518a 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.51 2009/06/06 15:00:27 ray Exp $ */ +/* $OpenBSD: diff.c,v 1.52 2009/06/06 15:37:28 ray Exp $ */ /* * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -21,7 +21,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff.c,v 1.51 2009/06/06 15:00:27 ray Exp $"; +static const char rcsid[] = "$OpenBSD: diff.c,v 1.52 2009/06/06 15:37:28 ray Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -256,7 +256,7 @@ main(int argc, char **argv) if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { if (format == D_IFDEF) errx(2, "-D option not supported with directories"); - diffdir(argv[0], argv[1]); + diffdir(argv[0], argv[1], dflags); } else { if (S_ISDIR(stb1.st_mode)) { argv[0] = splice(argv[0], argv[1]); @@ -268,7 +268,7 @@ main(int argc, char **argv) if (stat(argv[1], &stb2) < 0) err(2, "%s", argv[1]); } - print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1], + print_status(diffreg(argv[0], argv[1], dflags), argv[0], argv[1], NULL); } exit(status); |