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