diff options
| author |   ray <ray@openbsd.org> | 2009-06-06 15:00:27 +0000 |
|---|---|---|
| committer | ray <ray@openbsd.org> | 2009-06-06 15:00:27 +0000 |
| commit | dba1d6ea0e7adc7407ba8b634ca533c869704ccd (patch) | |
| tree | d1a4cfb9e472c0ad9ac6b51071e4e64c7887698a /usr.bin/diff/diff.h | |
| parent | Swedens National Day is today. ok jj@, halex@ and art@. -moj (diff) | |
| download | wireguard-openbsd-dba1d6ea0e7adc7407ba8b634ca533c869704ccd.tar.xz wireguard-openbsd-dba1d6ea0e7adc7407ba8b634ca533c869704ccd.zip | |
Pull changes from rcsdiff, similar to what was pulled into cvsdiff.
OK millert
Diffstat (limited to 'usr.bin/diff/diff.h')
| -rw-r--r-- | usr.bin/diff/diff.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 817057d8ca6..63002db1c40 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.29 2004/12/09 18:56:10 millert Exp $ */ +/* $OpenBSD: diff.h,v 1.30 2009/06/06 15:00:27 ray Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -50,9 +50,20 @@ /* * Output flags */ -#define D_HEADER 1 /* Print a header/footer between files */ -#define D_EMPTY1 2 /* Treat first file as empty (/dev/null) */ -#define D_EMPTY2 4 /* Treat second file as empty (/dev/null) */ +#define D_HEADER 0x001 /* Print a header/footer between files */ +#define D_EMPTY1 0x002 /* Treat first file as empty (/dev/null) */ +#define D_EMPTY2 0x004 /* Treat second file as empty (/dev/null) */ + +/* + * Command line flags + */ +#define D_FORCEASCII 0x008 /* Treat file as ascii regardless of content */ +#define D_FOLDBLANKS 0x010 /* Treat all white space as equal */ +#define D_MINIMAL 0x020 /* Make diff as small as possible */ +#define D_IGNORECASE 0x040 /* Case-insensitive matching */ +#define D_PROTOTYPE 0x080 /* Display C function prototype */ +#define D_EXPANDTABS 0x100 /* Expand tabs to spaces */ +#define D_IGNOREBLANKS 0x200 /* Ignore white space changes */ /* * Status values for print_status() and diffreg() return values @@ -73,8 +84,7 @@ struct excludes { struct excludes *next; }; -extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, - sflag, tflag, Tflag, wflag; +extern int lflag, Nflag, Pflag, rflag, sflag, Tflag; extern int format, context, status; extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; extern struct stat stb1, stb2; |