diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2006-09-21 15:30:08 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2006-09-21 15:30:08 +0000 |
| commit | 8e2c082dd14cb4b99468f4650dfa95f87cae0acf (patch) | |
| tree | 36ba221dd274fe71fb84a01f722bde186cafb111 /usr.bin/rcs/diff.h | |
| parent | a2ab53ec52316edf9ce164353dd0485d4a16b76b (diff) | |
Add support to rcsdiff for all the other diff flags that
are pertinent to files (not directories) and that do not
conflict with rcsdiff-specific flags. OK xsa@
Diffstat (limited to 'usr.bin/rcs/diff.h')
| -rw-r--r-- | usr.bin/rcs/diff.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/usr.bin/rcs/diff.h b/usr.bin/rcs/diff.h index dfc46f85c05..ef349b9ae44 100644 --- a/usr.bin/rcs/diff.h +++ b/usr.bin/rcs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.4 2006/05/15 06:58:03 xsa Exp $ */ +/* $OpenBSD: diff.h,v 1.5 2006/09/21 15:30:07 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -81,6 +81,17 @@ #define D_RCSDIFF 5 /* Reverse editor output: RCS format */ /* + * Command line flags + */ +#define D_FORCEASCII 0x01 /* Treat file as ascii regardless of content */ +#define D_FOLDBLANKS 0x02 /* Treat all white space as equal */ +#define D_MINIMAL 0x04 /* Make diff as small as possible */ +#define D_IGNORECASE 0x08 /* Case-insensitive matching */ +#define D_PROTOTYPE 0x10 /* Display C function prototype */ +#define D_EXPANDTABS 0x20 /* Expand tabs to spaces */ +#define D_IGNOREBLANKS 0x40 /* Ignore white space changes */ + +/* * Status values for rcs_diffreg() return values */ #define D_SAME 0 /* Files are the same */ @@ -97,15 +108,17 @@ struct rcs_lines; BUF *rcs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *, int); BUF *merge_diff3(char **, int); void diff_output(const char *, ...); -int rcs_diffreg(const char *, const char *, BUF *); +int rcs_diffreg(const char *, const char *, BUF *, int); int ed_patch_lines(struct rcs_lines *, struct rcs_lines *); +extern int diff_context; extern int diff_format; extern int diff3_conflicts; -extern char *diff_file; -extern char diffargs[128]; +extern char *diff_file, *diff_ignore_pats; +extern char diffargs[512]; /* XXX */ extern BUF *diffbuf; extern RCSNUM *diff_rev1; extern RCSNUM *diff_rev2; +extern regex_t *diff_ignore_re; #endif /* RCS_DIFF_H */ |