From ae8d569b0d3206631092f123a4796c817bc7adf6 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 25 Jun 2003 01:20:52 +0000 Subject: 4.3reno diff. This is free because of the Caldera license. Nasty, but a place to start. --- usr.bin/diff/diff.h | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 usr.bin/diff/diff.h (limited to 'usr.bin/diff/diff.h') diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h new file mode 100644 index 00000000000..7c11a5fb50d --- /dev/null +++ b/usr.bin/diff/diff.h @@ -0,0 +1,85 @@ +/* diff.h 4.7 85/08/16 */ + +/* + * diff - common declarations + */ + +#include +#include +#include +#include +#include +#include + +/* + * Output format options + */ +int opt; + +#define D_NORMAL 0 /* Normal output */ +#define D_EDIT -1 /* Editor script out */ +#define D_REVERSE 1 /* Reverse editor script */ +#define D_CONTEXT 2 /* Diff with context */ +#define D_IFDEF 3 /* Diff with merged #ifdef's */ +#define D_NREVERSE 4 /* Reverse ed script with numbered + lines and no trailing . */ + +int tflag; /* expand tabs on output */ + +/* + * Algorithm related options + */ +int hflag; /* -h, use halfhearted DIFFH */ +int bflag; /* ignore blanks in comparisons */ +int wflag; /* totally ignore blanks in comparisons */ +int iflag; /* ignore case in comparisons */ + +/* + * Options on hierarchical diffs. + */ +int lflag; /* long output format with header */ +int rflag; /* recursively trace directories */ +int sflag; /* announce files which are same */ +char *start; /* do file only if name >= this */ + +/* + * Variables for -I D_IFDEF option. + */ +int wantelses; /* -E */ +char *ifdef1; /* String for -1 */ +char *ifdef2; /* String for -2 */ +char *endifname; /* What we will print on next #endif */ +int inifdef; + +/* + * Variables for -c context option. + */ +int context; /* lines of context to be printed */ + +/* + * State for exit status. + */ +int status; +int anychange; +char *tempfile; /* used when comparing against std input */ + +/* + * Variables for diffdir. + */ +char **diffargv; /* option list to pass to recursive diffs */ + +/* + * Input file names. + * With diffdir, file1 and file2 are allocated BUFSIZ space, + * and padded with a '/', and then efile0 and efile1 point after + * the '/'. + */ +char *file1, *file2, *efile1, *efile2; +struct stat stb1, stb2; + +char *malloc(), *talloc(), *ralloc(); +char *savestr(), *splice(), *splicen(); +char *mktemp(), *copytemp(), *rindex(); +int done(); + +extern char diffh[], diff[], pr[]; -- cgit v1.2.3-59-g8ed1b