summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff/diff.h
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2015-10-05 20:15:00 +0000
committermillert <millert@openbsd.org>2015-10-05 20:15:00 +0000
commit40e7295b4ba441dfe69421af3a469a5dfbf9a3e8 (patch)
tree4410a81ab7d2118ffe0b1f67e7e4dc19a16466a5 /usr.bin/diff/diff.h
parentAdd support for !:strength modifier to adjust strength of a test. (diff)
downloadwireguard-openbsd-40e7295b4ba441dfe69421af3a469a5dfbf9a3e8.tar.xz
wireguard-openbsd-40e7295b4ba441dfe69421af3a469a5dfbf9a3e8.zip
Remove the non-standard -l flag that pipes the output through pr(1).
Based on a diff from and OK deraadt@
Diffstat (limited to 'usr.bin/diff/diff.h')
-rw-r--r--usr.bin/diff/diff.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index 5ac5f92e49a..3a36222419a 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: diff.h,v 1.32 2009/06/07 08:39:13 ray Exp $ */
-/*-
+
+/*ROR
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -71,20 +71,17 @@
#define D_SAME 0 /* Files are the same */
#define D_DIFFER 1 /* Files are different */
#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_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 occurred */
-#define D_SKIPPED1 8 /* path1 was a special file */
-#define D_SKIPPED2 9 /* path2 was a special file */
+#define D_MISMATCH1 3 /* path1 was a dir, path2 a file */
+#define D_MISMATCH2 4 /* path1 was a file, path2 a dir */
+#define D_SKIPPED1 5 /* path1 was a special file */
+#define D_SKIPPED2 6 /* path2 was a special file */
struct excludes {
char *pattern;
struct excludes *next;
};
-extern int lflag, Nflag, Pflag, rflag, sflag, Tflag;
+extern int Nflag, Pflag, rflag, sflag, Tflag;
extern int diff_format, diff_context, status;
extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
extern struct stat stb1, stb2;