diff options
| author |   millert <millert@openbsd.org> | 2003-07-21 21:57:22 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-07-21 21:57:22 +0000 |
| commit | fed3a06d29f0c37869ea3fabb132d895d15a1277 (patch) | |
| tree | 182e33e5d946a92fe5f0dc4595d4dadf72b978e2 /usr.bin/diff/diff.h | |
| parent | updated license (diff) | |
| download | wireguard-openbsd-fed3a06d29f0c37869ea3fabb132d895d15a1277.tar.xz wireguard-openbsd-fed3a06d29f0c37869ea3fabb132d895d15a1277.zip | |
POSIX-compliant output when there are two paths w/ the same name but
one is a file and the other is a directory in -r mode (cosmetic).
Diffstat (limited to 'usr.bin/diff/diff.h')
| -rw-r--r-- | usr.bin/diff/diff.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 9ff20a8e913..e7fc2c919fb 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.19 2003/07/09 00:39:25 millert Exp $ */ +/* $OpenBSD: diff.h,v 1.20 2003/07/21 21:57:22 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -59,8 +59,9 @@ #define D_BINARY 2 /* Binary files are different */ #define D_COMMON 3 /* Subdirectory common to both dirs */ #define D_ONLY 4 /* Only exists in one directory */ -#define D_MISMATCH 5 /* One path was a dir, the other a file */ -#define D_ERROR 6 /* An error ocurred */ +#define D_MISMATCH1 5 /* path1 was a dir, path2 a file */ +#define D_MISMATCH2 6 /* path1 was a file, path2 a dir */ +#define D_ERROR 7 /* An error ocurred */ struct excludes { char *pattern; |