Blame


1 b7ba71f0 2020-10-07 stsp /* Produce ed(1) script output from a diff_result. */
2 b7ba71f0 2020-10-07 stsp /*
3 b7ba71f0 2020-10-07 stsp * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
4 b7ba71f0 2020-10-07 stsp * Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org>
5 b7ba71f0 2020-10-07 stsp *
6 b7ba71f0 2020-10-07 stsp * Permission to use, copy, modify, and distribute this software for any
7 b7ba71f0 2020-10-07 stsp * purpose with or without fee is hereby granted, provided that the above
8 b7ba71f0 2020-10-07 stsp * copyright notice and this permission notice appear in all copies.
9 b7ba71f0 2020-10-07 stsp *
10 b7ba71f0 2020-10-07 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 b7ba71f0 2020-10-07 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 b7ba71f0 2020-10-07 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 b7ba71f0 2020-10-07 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 b7ba71f0 2020-10-07 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 b7ba71f0 2020-10-07 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 b7ba71f0 2020-10-07 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 b7ba71f0 2020-10-07 stsp */
18 b7ba71f0 2020-10-07 stsp
19 b7ba71f0 2020-10-07 stsp #include <errno.h>
20 fe6d58fb 2020-11-14 naddy #include <stdint.h>
21 b7ba71f0 2020-10-07 stsp #include <stdio.h>
22 b7ba71f0 2020-10-07 stsp #include <stdlib.h>
23 b7ba71f0 2020-10-07 stsp #include <stdbool.h>
24 b7ba71f0 2020-10-07 stsp
25 b7ba71f0 2020-10-07 stsp #include <arraylist.h>
26 b7ba71f0 2020-10-07 stsp #include <diff_main.h>
27 b7ba71f0 2020-10-07 stsp #include <diff_output.h>
28 b7ba71f0 2020-10-07 stsp
29 b7ba71f0 2020-10-07 stsp #include "diff_internal.h"
30 b7ba71f0 2020-10-07 stsp
31 b7ba71f0 2020-10-07 stsp static int
32 b7ba71f0 2020-10-07 stsp output_edscript_chunk(struct diff_output_info *outinfo,
33 b7ba71f0 2020-10-07 stsp FILE *dest, const struct diff_input_info *info,
34 b7ba71f0 2020-10-07 stsp const struct diff_result *result,
35 26595c7d 2020-10-15 stsp struct diff_chunk_context *cc)
36 b7ba71f0 2020-10-07 stsp {
37 b7ba71f0 2020-10-07 stsp off_t outoff = 0, *offp;
38 b7ba71f0 2020-10-07 stsp int left_start, left_len, right_start, right_len;
39 b7ba71f0 2020-10-07 stsp int rc;
40 b7ba71f0 2020-10-07 stsp
41 b7ba71f0 2020-10-07 stsp left_len = cc->left.end - cc->left.start;
42 b7ba71f0 2020-10-07 stsp if (left_len < 0)
43 b7ba71f0 2020-10-07 stsp return EINVAL;
44 c16dde50 2020-10-22 stsp else if (result->left->atoms.len == 0)
45 ede9a86a 2020-10-07 stsp left_start = 0;
46 b7ba71f0 2020-10-07 stsp else if (left_len == 0 && cc->left.start > 0)
47 b7ba71f0 2020-10-07 stsp left_start = cc->left.start;
48 346d4986 2021-10-06 stsp else if (cc->left.end > 0)
49 b7ba71f0 2020-10-07 stsp left_start = cc->left.start + 1;
50 346d4986 2021-10-06 stsp else
51 346d4986 2021-10-06 stsp left_start = cc->left.start;
52 b7ba71f0 2020-10-07 stsp
53 b7ba71f0 2020-10-07 stsp right_len = cc->right.end - cc->right.start;
54 b7ba71f0 2020-10-07 stsp if (right_len < 0)
55 b7ba71f0 2020-10-07 stsp return EINVAL;
56 c16dde50 2020-10-22 stsp else if (result->right->atoms.len == 0)
57 ede9a86a 2020-10-07 stsp right_start = 0;
58 b7ba71f0 2020-10-07 stsp else if (right_len == 0 && cc->right.start > 0)
59 b7ba71f0 2020-10-07 stsp right_start = cc->right.start;
60 346d4986 2021-10-06 stsp else if (cc->right.end > 0)
61 b7ba71f0 2020-10-07 stsp right_start = cc->right.start + 1;
62 346d4986 2021-10-06 stsp else
63 346d4986 2021-10-06 stsp right_start = cc->right.start;
64 b7ba71f0 2020-10-07 stsp
65 26595c7d 2020-10-15 stsp if (left_len == 0) {
66 26595c7d 2020-10-15 stsp /* addition */
67 26595c7d 2020-10-15 stsp if (right_len == 1) {
68 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%da%d\n", left_start, right_start);
69 26595c7d 2020-10-15 stsp } else {
70 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%da%d,%d\n", left_start,
71 26595c7d 2020-10-15 stsp right_start, cc->right.end);
72 26595c7d 2020-10-15 stsp }
73 26595c7d 2020-10-15 stsp } else if (right_len == 0) {
74 26595c7d 2020-10-15 stsp /* deletion */
75 b7ba71f0 2020-10-07 stsp if (left_len == 1) {
76 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%dd%d\n", left_start,
77 26595c7d 2020-10-15 stsp right_start);
78 b7ba71f0 2020-10-07 stsp } else {
79 b7ba71f0 2020-10-07 stsp rc = fprintf(dest, "%d,%dd%d\n", left_start,
80 b7ba71f0 2020-10-07 stsp cc->left.end, right_start);
81 b7ba71f0 2020-10-07 stsp }
82 26595c7d 2020-10-15 stsp } else {
83 26595c7d 2020-10-15 stsp /* change */
84 26595c7d 2020-10-15 stsp if (left_len == 1 && right_len == 1) {
85 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%dc%d\n", left_start, right_start);
86 26595c7d 2020-10-15 stsp } else if (left_len == 1) {
87 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%dc%d,%d\n", left_start,
88 b7ba71f0 2020-10-07 stsp right_start, cc->right.end);
89 26595c7d 2020-10-15 stsp } else if (right_len == 1) {
90 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%d,%dc%d\n", left_start,
91 26595c7d 2020-10-15 stsp cc->left.end, right_start);
92 26595c7d 2020-10-15 stsp } else {
93 26595c7d 2020-10-15 stsp rc = fprintf(dest, "%d,%dc%d,%d\n", left_start,
94 26595c7d 2020-10-15 stsp cc->left.end, right_start, cc->right.end);
95 b7ba71f0 2020-10-07 stsp }
96 26595c7d 2020-10-15 stsp }
97 b7ba71f0 2020-10-07 stsp if (rc < 0)
98 b7ba71f0 2020-10-07 stsp return errno;
99 b7ba71f0 2020-10-07 stsp if (outinfo) {
100 b7ba71f0 2020-10-07 stsp ARRAYLIST_ADD(offp, outinfo->line_offsets);
101 b7ba71f0 2020-10-07 stsp if (offp == NULL)
102 b7ba71f0 2020-10-07 stsp return ENOMEM;
103 b7ba71f0 2020-10-07 stsp outoff += rc;
104 b7ba71f0 2020-10-07 stsp *offp = outoff;
105 b7ba71f0 2020-10-07 stsp }
106 b7ba71f0 2020-10-07 stsp
107 b7ba71f0 2020-10-07 stsp return DIFF_RC_OK;
108 b7ba71f0 2020-10-07 stsp }
109 b7ba71f0 2020-10-07 stsp
110 b7ba71f0 2020-10-07 stsp int
111 b7ba71f0 2020-10-07 stsp diff_output_edscript(struct diff_output_info **output_info,
112 b7ba71f0 2020-10-07 stsp FILE *dest, const struct diff_input_info *info,
113 b7ba71f0 2020-10-07 stsp const struct diff_result *result)
114 b7ba71f0 2020-10-07 stsp {
115 b7ba71f0 2020-10-07 stsp struct diff_output_info *outinfo = NULL;
116 26595c7d 2020-10-15 stsp struct diff_chunk_context cc = {};
117 e51ebd83 2020-11-21 stsp int atomizer_flags = (result->left->atomizer_flags|
118 e51ebd83 2020-11-21 stsp result->right->atomizer_flags);
119 e51ebd83 2020-11-21 stsp int flags = (result->left->root->diff_flags |
120 e51ebd83 2020-11-21 stsp result->right->root->diff_flags);
121 e51ebd83 2020-11-21 stsp bool force_text = (flags & DIFF_FLAG_FORCE_TEXT_DATA);
122 e51ebd83 2020-11-21 stsp bool have_binary = (atomizer_flags & DIFF_ATOMIZER_FOUND_BINARY_DATA);
123 b7ba71f0 2020-10-07 stsp int i, rc;
124 b7ba71f0 2020-10-07 stsp
125 b7ba71f0 2020-10-07 stsp if (!result)
126 b7ba71f0 2020-10-07 stsp return EINVAL;
127 b7ba71f0 2020-10-07 stsp if (result->rc != DIFF_RC_OK)
128 b7ba71f0 2020-10-07 stsp return result->rc;
129 b7ba71f0 2020-10-07 stsp
130 b7ba71f0 2020-10-07 stsp if (output_info) {
131 b7ba71f0 2020-10-07 stsp *output_info = diff_output_info_alloc();
132 b7ba71f0 2020-10-07 stsp if (*output_info == NULL)
133 b7ba71f0 2020-10-07 stsp return ENOMEM;
134 b7ba71f0 2020-10-07 stsp outinfo = *output_info;
135 b7ba71f0 2020-10-07 stsp }
136 b7ba71f0 2020-10-07 stsp
137 e51ebd83 2020-11-21 stsp if (have_binary && !force_text) {
138 e51ebd83 2020-11-21 stsp for (i = 0; i < result->chunks.len; i++) {
139 e51ebd83 2020-11-21 stsp struct diff_chunk *c = &result->chunks.head[i];
140 e51ebd83 2020-11-21 stsp enum diff_chunk_type t = diff_chunk_type(c);
141 e51ebd83 2020-11-21 stsp
142 e51ebd83 2020-11-21 stsp if (t != CHUNK_MINUS && t != CHUNK_PLUS)
143 e51ebd83 2020-11-21 stsp continue;
144 e51ebd83 2020-11-21 stsp
145 e51ebd83 2020-11-21 stsp fprintf(dest, "Binary files %s and %s differ\n",
146 e4c510c1 2020-11-21 stsp diff_output_get_label_left(info),
147 e4c510c1 2020-11-21 stsp diff_output_get_label_right(info));
148 e51ebd83 2020-11-21 stsp break;
149 e51ebd83 2020-11-21 stsp }
150 e51ebd83 2020-11-21 stsp
151 e51ebd83 2020-11-21 stsp return DIFF_RC_OK;
152 e51ebd83 2020-11-21 stsp }
153 e51ebd83 2020-11-21 stsp
154 b7ba71f0 2020-10-07 stsp for (i = 0; i < result->chunks.len; i++) {
155 b7ba71f0 2020-10-07 stsp struct diff_chunk *chunk = &result->chunks.head[i];
156 b7ba71f0 2020-10-07 stsp enum diff_chunk_type t = diff_chunk_type(chunk);
157 26595c7d 2020-10-15 stsp struct diff_chunk_context next;
158 b7ba71f0 2020-10-07 stsp
159 b7ba71f0 2020-10-07 stsp if (t != CHUNK_MINUS && t != CHUNK_PLUS)
160 b7ba71f0 2020-10-07 stsp continue;
161 b7ba71f0 2020-10-07 stsp
162 cbf93b70 2020-10-16 stsp if (diff_chunk_context_empty(&cc)) {
163 26595c7d 2020-10-15 stsp /* Note down the start point, any number of subsequent
164 26595c7d 2020-10-15 stsp * chunks may be joined up to this chunk by being
165 26595c7d 2020-10-15 stsp * directly adjacent. */
166 26595c7d 2020-10-15 stsp diff_chunk_context_get(&cc, result, i, 0);
167 26595c7d 2020-10-15 stsp continue;
168 26595c7d 2020-10-15 stsp }
169 b7ba71f0 2020-10-07 stsp
170 26595c7d 2020-10-15 stsp /* There already is a previous chunk noted down for being
171 26595c7d 2020-10-15 stsp * printed. Does it join up with this one? */
172 26595c7d 2020-10-15 stsp diff_chunk_context_get(&next, result, i, 0);
173 26595c7d 2020-10-15 stsp
174 26595c7d 2020-10-15 stsp if (diff_chunk_contexts_touch(&cc, &next)) {
175 26595c7d 2020-10-15 stsp /* This next context touches or overlaps the previous
176 26595c7d 2020-10-15 stsp * one, join. */
177 26595c7d 2020-10-15 stsp diff_chunk_contexts_merge(&cc, &next);
178 b7ba71f0 2020-10-07 stsp continue;
179 26595c7d 2020-10-15 stsp }
180 b7ba71f0 2020-10-07 stsp
181 26595c7d 2020-10-15 stsp rc = output_edscript_chunk(outinfo, dest, info, result, &cc);
182 b7ba71f0 2020-10-07 stsp if (rc != DIFF_RC_OK)
183 b7ba71f0 2020-10-07 stsp return rc;
184 26595c7d 2020-10-15 stsp cc = next;
185 b7ba71f0 2020-10-07 stsp }
186 b7ba71f0 2020-10-07 stsp
187 cbf93b70 2020-10-16 stsp if (!diff_chunk_context_empty(&cc))
188 26595c7d 2020-10-15 stsp return output_edscript_chunk(outinfo, dest, info, result, &cc);
189 b7ba71f0 2020-10-07 stsp return DIFF_RC_OK;
190 b7ba71f0 2020-10-07 stsp }