1 3b0f3d61 2020-01-22 neels /* Output all lines of a diff_result. */
3 3b0f3d61 2020-01-22 neels * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
5 3b0f3d61 2020-01-22 neels * Permission to use, copy, modify, and distribute this software for any
6 3b0f3d61 2020-01-22 neels * purpose with or without fee is hereby granted, provided that the above
7 3b0f3d61 2020-01-22 neels * copyright notice and this permission notice appear in all copies.
9 3b0f3d61 2020-01-22 neels * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 3b0f3d61 2020-01-22 neels * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 3b0f3d61 2020-01-22 neels * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 3b0f3d61 2020-01-22 neels * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 3b0f3d61 2020-01-22 neels * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 3b0f3d61 2020-01-22 neels * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 3b0f3d61 2020-01-22 neels * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 e10a628a 2020-09-16 stsp #include <errno.h>
19 fe6d58fb 2020-11-14 naddy #include <stdint.h>
20 e10a628a 2020-09-16 stsp #include <stdio.h>
21 e10a628a 2020-09-16 stsp #include <stdbool.h>
22 e10a628a 2020-09-16 stsp #include <stdlib.h>
24 1dfba055 2020-10-07 stsp #include <arraylist.h>
25 1dfba055 2020-10-07 stsp #include <diff_main.h>
26 1dfba055 2020-10-07 stsp #include <diff_output.h>
28 85ab4559 2020-09-22 stsp #include "diff_internal.h"
31 b1aa94aa 2022-08-30 stsp output_plain_chunk(struct diff_output_info *outinfo,
32 b1aa94aa 2022-08-30 stsp FILE *dest, const struct diff_input_info *info,
33 b1aa94aa 2022-08-30 stsp const struct diff_result *result,
34 b1aa94aa 2022-08-30 stsp struct diff_chunk_context *cc)
36 b1aa94aa 2022-08-30 stsp off_t outoff = 0, *offp;
37 b1aa94aa 2022-08-30 stsp int left_start, left_len, right_start, right_len;
39 b1aa94aa 2022-08-30 stsp bool change = false;
41 b1aa94aa 2022-08-30 stsp left_len = cc->left.end - cc->left.start;
42 b1aa94aa 2022-08-30 stsp if (left_len < 0)
43 b1aa94aa 2022-08-30 stsp return EINVAL;
44 b1aa94aa 2022-08-30 stsp else if (result->left->atoms.len == 0)
45 b1aa94aa 2022-08-30 stsp left_start = 0;
46 b1aa94aa 2022-08-30 stsp else if (left_len == 0 && cc->left.start > 0)
47 b1aa94aa 2022-08-30 stsp left_start = cc->left.start;
48 b1aa94aa 2022-08-30 stsp else if (cc->left.end > 0)
49 b1aa94aa 2022-08-30 stsp left_start = cc->left.start + 1;
51 b1aa94aa 2022-08-30 stsp left_start = cc->left.start;
53 b1aa94aa 2022-08-30 stsp right_len = cc->right.end - cc->right.start;
54 b1aa94aa 2022-08-30 stsp if (right_len < 0)
55 b1aa94aa 2022-08-30 stsp return EINVAL;
56 b1aa94aa 2022-08-30 stsp else if (result->right->atoms.len == 0)
57 b1aa94aa 2022-08-30 stsp right_start = 0;
58 b1aa94aa 2022-08-30 stsp else if (right_len == 0 && cc->right.start > 0)
59 b1aa94aa 2022-08-30 stsp right_start = cc->right.start;
60 b1aa94aa 2022-08-30 stsp else if (cc->right.end > 0)
61 b1aa94aa 2022-08-30 stsp right_start = cc->right.start + 1;
63 b1aa94aa 2022-08-30 stsp right_start = cc->right.start;
65 b1aa94aa 2022-08-30 stsp if (left_len == 0) {
66 b1aa94aa 2022-08-30 stsp /* addition */
67 b1aa94aa 2022-08-30 stsp if (right_len == 1) {
68 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%da%d\n", left_start, right_start);
70 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%da%d,%d\n", left_start,
71 b1aa94aa 2022-08-30 stsp right_start, cc->right.end);
73 b1aa94aa 2022-08-30 stsp } else if (right_len == 0) {
74 b1aa94aa 2022-08-30 stsp /* deletion */
75 b1aa94aa 2022-08-30 stsp if (left_len == 1) {
76 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%dd%d\n", left_start,
77 b1aa94aa 2022-08-30 stsp right_start);
79 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%d,%dd%d\n", left_start,
80 b1aa94aa 2022-08-30 stsp cc->left.end, right_start);
83 b1aa94aa 2022-08-30 stsp /* change */
84 b1aa94aa 2022-08-30 stsp change = true;
85 b1aa94aa 2022-08-30 stsp if (left_len == 1 && right_len == 1) {
86 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%dc%d\n", left_start, right_start);
87 b1aa94aa 2022-08-30 stsp } else if (left_len == 1) {
88 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%dc%d,%d\n", left_start,
89 b1aa94aa 2022-08-30 stsp right_start, cc->right.end);
90 b1aa94aa 2022-08-30 stsp } else if (right_len == 1) {
91 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%d,%dc%d\n", left_start,
92 b1aa94aa 2022-08-30 stsp cc->left.end, right_start);
94 b1aa94aa 2022-08-30 stsp rc = fprintf(dest, "%d,%dc%d,%d\n", left_start,
95 b1aa94aa 2022-08-30 stsp cc->left.end, right_start, cc->right.end);
100 b1aa94aa 2022-08-30 stsp * Now write out all the joined chunks.
102 b1aa94aa 2022-08-30 stsp * If the hunk denotes a change, it will come in the form of a deletion
103 b1aa94aa 2022-08-30 stsp * chunk followed by a addition chunk. Print a marker to break up the
104 b1aa94aa 2022-08-30 stsp * additions and deletions when this happens.
107 b1aa94aa 2022-08-30 stsp for (c_idx = cc->chunk.start; c_idx < cc->chunk.end; c_idx++) {
108 b1aa94aa 2022-08-30 stsp const struct diff_chunk *c = &result->chunks.head[c_idx];
109 b1aa94aa 2022-08-30 stsp if (c->left_count && !c->right_count)
110 b1aa94aa 2022-08-30 stsp rc = diff_output_lines(outinfo, dest,
111 b1aa94aa 2022-08-30 stsp c->solved ? "< " : "?",
112 b1aa94aa 2022-08-30 stsp c->left_start, c->left_count);
113 b1aa94aa 2022-08-30 stsp else if (c->right_count && !c->left_count) {
114 b1aa94aa 2022-08-30 stsp if (change)
115 b1aa94aa 2022-08-30 stsp fprintf(dest, "---\n");
116 b1aa94aa 2022-08-30 stsp rc = diff_output_lines(outinfo, dest,
117 b1aa94aa 2022-08-30 stsp c->solved ? "> " : "?",
118 b1aa94aa 2022-08-30 stsp c->right_start, c->right_count);
122 b1aa94aa 2022-08-30 stsp if (cc->chunk.end == result->chunks.len) {
123 b1aa94aa 2022-08-30 stsp rc = diff_output_trailing_newline_msg(outinfo, dest, c);
124 b1aa94aa 2022-08-30 stsp if (rc != DIFF_RC_OK)
129 b1aa94aa 2022-08-30 stsp if (rc < 0)
130 b1aa94aa 2022-08-30 stsp return errno;
131 b1aa94aa 2022-08-30 stsp if (outinfo) {
132 b1aa94aa 2022-08-30 stsp ARRAYLIST_ADD(offp, outinfo->line_offsets);
133 b1aa94aa 2022-08-30 stsp if (offp == NULL)
134 b1aa94aa 2022-08-30 stsp return ENOMEM;
135 b1aa94aa 2022-08-30 stsp outoff += rc;
136 b1aa94aa 2022-08-30 stsp *offp = outoff;
139 b1aa94aa 2022-08-30 stsp return DIFF_RC_OK;
143 b1aa94aa 2022-08-30 stsp diff_output_plain(struct diff_output_info **output_info,
144 b1aa94aa 2022-08-30 stsp FILE *dest, const struct diff_input_info *info,
145 b1aa94aa 2022-08-30 stsp const struct diff_result *result)
147 2c20a3ed 2020-09-22 stsp struct diff_output_info *outinfo = NULL;
148 b1aa94aa 2022-08-30 stsp struct diff_chunk_context cc = {};
149 b1aa94aa 2022-08-30 stsp int atomizer_flags = (result->left->atomizer_flags|
150 b1aa94aa 2022-08-30 stsp result->right->atomizer_flags);
151 b1aa94aa 2022-08-30 stsp int flags = (result->left->root->diff_flags |
152 b1aa94aa 2022-08-30 stsp result->right->root->diff_flags);
153 b1aa94aa 2022-08-30 stsp bool force_text = (flags & DIFF_FLAG_FORCE_TEXT_DATA);
154 b1aa94aa 2022-08-30 stsp bool have_binary = (atomizer_flags & DIFF_ATOMIZER_FOUND_BINARY_DATA);
157 3b0f3d61 2020-01-22 neels if (!result)
158 3e6cba3a 2020-08-13 stsp return EINVAL;
159 3b0f3d61 2020-01-22 neels if (result->rc != DIFF_RC_OK)
160 3b0f3d61 2020-01-22 neels return result->rc;
162 2c20a3ed 2020-09-22 stsp if (output_info) {
163 2c20a3ed 2020-09-22 stsp *output_info = diff_output_info_alloc();
164 2c20a3ed 2020-09-22 stsp if (*output_info == NULL)
165 b1aa94aa 2022-08-30 stsp return ENOMEM;
166 2c20a3ed 2020-09-22 stsp outinfo = *output_info;
169 b1aa94aa 2022-08-30 stsp if (have_binary && !force_text) {
170 b1aa94aa 2022-08-30 stsp for (i = 0; i < result->chunks.len; i++) {
171 b1aa94aa 2022-08-30 stsp struct diff_chunk *c = &result->chunks.head[i];
172 b1aa94aa 2022-08-30 stsp enum diff_chunk_type t = diff_chunk_type(c);
174 b1aa94aa 2022-08-30 stsp if (t != CHUNK_MINUS && t != CHUNK_PLUS)
177 b1aa94aa 2022-08-30 stsp fprintf(dest, "Binary files %s and %s differ\n",
178 b1aa94aa 2022-08-30 stsp diff_output_get_label_left(info),
179 b1aa94aa 2022-08-30 stsp diff_output_get_label_right(info));
183 b1aa94aa 2022-08-30 stsp return DIFF_RC_OK;
186 3b0f3d61 2020-01-22 neels for (i = 0; i < result->chunks.len; i++) {
187 b1aa94aa 2022-08-30 stsp struct diff_chunk *chunk = &result->chunks.head[i];
188 b1aa94aa 2022-08-30 stsp enum diff_chunk_type t = diff_chunk_type(chunk);
189 b1aa94aa 2022-08-30 stsp struct diff_chunk_context next;
191 b1aa94aa 2022-08-30 stsp if (t != CHUNK_MINUS && t != CHUNK_PLUS)
194 b1aa94aa 2022-08-30 stsp if (diff_chunk_context_empty(&cc)) {
195 b1aa94aa 2022-08-30 stsp /* Note down the start point, any number of subsequent
196 b1aa94aa 2022-08-30 stsp * chunks may be joined up to this chunk by being
197 b1aa94aa 2022-08-30 stsp * directly adjacent. */
198 b1aa94aa 2022-08-30 stsp diff_chunk_context_get(&cc, result, i, 0);
202 b1aa94aa 2022-08-30 stsp /* There already is a previous chunk noted down for being
203 b1aa94aa 2022-08-30 stsp * printed. Does it join up with this one? */
204 b1aa94aa 2022-08-30 stsp diff_chunk_context_get(&next, result, i, 0);
206 b1aa94aa 2022-08-30 stsp if (diff_chunk_contexts_touch(&cc, &next)) {
207 b1aa94aa 2022-08-30 stsp /* This next context touches or overlaps the previous
208 b1aa94aa 2022-08-30 stsp * one, join. */
209 b1aa94aa 2022-08-30 stsp diff_chunk_contexts_merge(&cc, &next);
210 b1aa94aa 2022-08-30 stsp /* When we merge the last chunk we can end up with one
211 b1aa94aa 2022-08-30 stsp * hanging chunk and have to come back for it after the
215 b1aa94aa 2022-08-30 stsp rc = output_plain_chunk(outinfo, dest, info, result, &cc);
216 b1aa94aa 2022-08-30 stsp if (rc != DIFF_RC_OK)
220 b1aa94aa 2022-08-30 stsp if (!diff_chunk_context_empty(&cc))
221 b1aa94aa 2022-08-30 stsp return output_plain_chunk(outinfo, dest, info, result, &cc);
222 3b0f3d61 2020-01-22 neels return DIFF_RC_OK;
