1 
2 
3 /*ROR
4  * Copyright (c) 1991, 1993
5  *	The Regents of the University of California.  All rights reserved.
6  *
7  * Redistribution and use in source and binary forms, with or without
8  * modification, are permitted provided that the following conditions
9  * are met:
10  * 1. Redistributions of source code must retain the above copyright
11  *    notice, this list of conditions and the following disclaimer.
12  * 2. Redistributions in binary form must reproduce the above copyright
13  *    notice, this list of conditions and the following disclaimer in the
14  *    documentation and/or other materials provided with the distribution.
15  * 3. Neither the name of the University nor the names of its contributors
16  *    may be used to endorse or promote products derived from this software
17  *    without specific prior written permission.
18  *
19  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29  * SUCH DAMAGE.
30  *
31  *	@(#)diff.h	8.1 (Berkeley) 6/6/93
32  */
33 
34 #include <sys/types.h>
35 #include <regex.h>
36 
37 /*
38  * Output format options
39  */
40 #define	D_NORMAL	0	/* Normal output */
41 #define	D_UNIFIED	3	/* Unified context diff */
42 #define	D_BRIEF		6	/* Say if the files differ */
43 
44 /*
45  * Output flags
46  */
47 #define	D_HEADER	0x001	/* Print a header/footer between files */
48 #define	D_EMPTY1	0x002	/* Treat first file as empty (/dev/null) */
49 #define	D_EMPTY2	0x004	/* Treat second file as empty (/dev/null) */
50 
51 /*
52  * Command line flags
53  */
54 #define D_FORCEASCII	0x008	/* Treat file as ascii regardless of content */
55 #define D_FOLDBLANKS	0x010	/* Treat all white space as equal */
56 #define D_MINIMAL	0x020	/* Make diff as small as possible */
57 #define D_IGNORECASE	0x040	/* Case-insensitive matching */
58 #define D_PROTOTYPE	0x080	/* Display C function prototype */
59 #define D_EXPANDTABS	0x100	/* Expand tabs to spaces */
60 #define D_IGNOREBLANKS	0x200	/* Ignore white space changes */
61 
62 /*
63  * Status values for got_diffreg() return values
64  */
65 #define	D_SAME		0	/* Files are the same */
66 #define	D_DIFFER	1	/* Files are different */
67 #define	D_BINARY	2	/* Binary files are different */
68 #define	D_MISMATCH1	3	/* path1 was a dir, path2 a file */
69 #define	D_MISMATCH2	4	/* path1 was a file, path2 a dir */
70 #define	D_SKIPPED1	5	/* path1 was a special file */
71 #define	D_SKIPPED2	6	/* path2 was a special file */
72 
73 struct excludes {
74 	char *pattern;
75 	struct excludes *next;
76 };
77 
78 /*
79  * The following struct is used to record change information when
80  * doing a "context" or "unified" diff.  (see routine "change" to
81  * understand the highly mnemonic field names)
82  */
83 struct context_vec {
84 	int	a;		/* start line in old file */
85 	int	b;		/* end line in old file */
86 	int	c;		/* start line in new file */
87 	int	d;		/* end line in new file */
88 };
89 
90 struct got_diff_change {
91 	SIMPLEQ_ENTRY(got_diff_change) entry;
92 	struct context_vec cv;
93 };
94 
95 struct got_diff_changes {
96 	int nchanges;
97 	SIMPLEQ_HEAD(, got_diff_change) entries;
98 };
99 
100 struct got_diff_state {
101 	int  *J;			/* will be overlaid on class */
102 	int  *class;		/* will be overlaid on file[0] */
103 	int  *klist;		/* will be overlaid on file[0] after class */
104 	int  *member;		/* will be overlaid on file[1] */
105 	int   clen;
106 	int   len[2];
107 	int   pref, suff;	/* length of prefix and suffix */
108 	int   slen[2];
109 	int   anychange;
110 	long *ixnew;		/* will be overlaid on file[1] */
111 	long *ixold;		/* will be overlaid on klist */
112 	struct cand *clist;	/* merely a free storage pot for candidates */
113 	int   clistlen;		/* the length of clist */
114 	struct line *sfile[2];	/* shortened by pruning common prefix/suffix */
115 	u_char *chrtran;		/* translation table for case-folding */
116 	struct context_vec *context_vec_start;
117 	struct context_vec *context_vec_end;
118 	struct context_vec *context_vec_ptr;
119 	struct line *file[2];
120 #define FUNCTION_CONTEXT_SIZE	55
121 	char lastbuf[FUNCTION_CONTEXT_SIZE];
122 	int lastline;
123 	int lastmatchline;
124 	struct stat stb1, stb2;
125 	size_t max_context;
126 };
127 
128 void got_diff_state_free(struct got_diff_state *);
129 
130 struct got_diff_args {
131 	int	 Tflag;
132 	int	 diff_format, diff_context, status;
133 	char	 *diffargs;
134 	const char *label[2];
135 };
136 
137 #define GOT_DIFF_CONFLICT_MARKER_BEGIN	"<<<<<<<"
138 #define GOT_DIFF_CONFLICT_MARKER_ORIG	"|||||||"
139 #define GOT_DIFF_CONFLICT_MARKER_SEP	"======="
140 #define GOT_DIFF_CONFLICT_MARKER_END	">>>>>>>"
141 
142 const struct got_error *got_diffreg(int *, FILE *,
143     FILE *, int, struct got_diff_args *, struct got_diff_state *, FILE *,
144     struct got_diff_changes *);
145 
146 const struct got_error *got_diff_blob_lines_changed(struct got_diff_changes **,
147     struct got_blob_object *, struct got_blob_object *);
148 const struct got_error *got_diff_blob_file_lines_changed(struct got_diff_changes **,
149     struct got_blob_object *, FILE *, size_t);
150 void got_diff_free_changes(struct got_diff_changes *);
151 
152 const struct got_error *got_merge_diff3(int *, int, const char *, const char *,
153     const char *, const char *, const char *, const char *);
154 
155 const struct got_error *got_diff_files(struct got_diff_changes **,
156     struct got_diff_state **, struct got_diff_args **, int *, FILE *, size_t,
157     const char *, FILE *, size_t, const char *, int, FILE *);
158 
159 void got_diff_dump_change(FILE *, struct got_diff_change *,
160     struct got_diff_state *, struct got_diff_args *, FILE *, FILE *, int);