Blame


1 574ed2c3 2017-11-29 stsp /*
2 fe621944 2020-11-10 stsp * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
3 fe621944 2020-11-10 stsp * Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org>
4 574ed2c3 2017-11-29 stsp *
5 fe621944 2020-11-10 stsp * Permission to use, copy, modify, and distribute this software for any
6 fe621944 2020-11-10 stsp * purpose with or without fee is hereby granted, provided that the above
7 fe621944 2020-11-10 stsp * copyright notice and this permission notice appear in all copies.
8 574ed2c3 2017-11-29 stsp *
9 fe621944 2020-11-10 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 fe621944 2020-11-10 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 fe621944 2020-11-10 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 fe621944 2020-11-10 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 fe621944 2020-11-10 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 fe621944 2020-11-10 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 fe621944 2020-11-10 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 574ed2c3 2017-11-29 stsp */
17 574ed2c3 2017-11-29 stsp
18 fe621944 2020-11-10 stsp #include <sys/mman.h>
19 574ed2c3 2017-11-29 stsp #include <sys/stat.h>
20 7d283eee 2017-11-29 stsp #include <sys/queue.h>
21 574ed2c3 2017-11-29 stsp
22 574ed2c3 2017-11-29 stsp #include <errno.h>
23 d7b5a0e8 2022-04-20 stsp #include <sha1.h>
24 574ed2c3 2017-11-29 stsp #include <stdio.h>
25 574ed2c3 2017-11-29 stsp #include <stdlib.h>
26 574ed2c3 2017-11-29 stsp #include <string.h>
27 574ed2c3 2017-11-29 stsp
28 7d283eee 2017-11-29 stsp #include "got_object.h"
29 fe621944 2020-11-10 stsp #include "got_opentemp.h"
30 fe621944 2020-11-10 stsp #include "got_error.h"
31 7d283eee 2017-11-29 stsp
32 718b3ab0 2018-03-17 stsp #include "got_lib_diff.h"
33 574ed2c3 2017-11-29 stsp
34 fe621944 2020-11-10 stsp const struct diff_algo_config myers_then_patience;
35 fe621944 2020-11-10 stsp const struct diff_algo_config myers_then_myers_divide;
36 fe621944 2020-11-10 stsp const struct diff_algo_config patience;
37 fe621944 2020-11-10 stsp const struct diff_algo_config myers_divide;
38 574ed2c3 2017-11-29 stsp
39 fe621944 2020-11-10 stsp const struct diff_algo_config myers_then_patience = (struct diff_algo_config){
40 fe621944 2020-11-10 stsp .impl = diff_algo_myers,
41 fe621944 2020-11-10 stsp .permitted_state_size = 1024 * 1024 * sizeof(int),
42 fe621944 2020-11-10 stsp .fallback_algo = &patience,
43 fe621944 2020-11-10 stsp };
44 574ed2c3 2017-11-29 stsp
45 fe621944 2020-11-10 stsp const struct diff_algo_config myers_then_myers_divide =
46 fe621944 2020-11-10 stsp (struct diff_algo_config){
47 fe621944 2020-11-10 stsp .impl = diff_algo_myers,
48 fe621944 2020-11-10 stsp .permitted_state_size = 1024 * 1024 * sizeof(int),
49 fe621944 2020-11-10 stsp .fallback_algo = &myers_divide,
50 fe621944 2020-11-10 stsp };
51 574ed2c3 2017-11-29 stsp
52 fe621944 2020-11-10 stsp const struct diff_algo_config patience = (struct diff_algo_config){
53 fe621944 2020-11-10 stsp .impl = diff_algo_patience,
54 fe621944 2020-11-10 stsp /* After subdivision, do Patience again: */
55 fe621944 2020-11-10 stsp .inner_algo = &patience,
56 fe621944 2020-11-10 stsp /* If subdivision failed, do Myers Divide et Impera: */
57 fe621944 2020-11-10 stsp .fallback_algo = &myers_then_myers_divide,
58 574ed2c3 2017-11-29 stsp };
59 574ed2c3 2017-11-29 stsp
60 fe621944 2020-11-10 stsp const struct diff_algo_config myers_divide = (struct diff_algo_config){
61 fe621944 2020-11-10 stsp .impl = diff_algo_myers_divide,
62 fe621944 2020-11-10 stsp /* When division succeeded, start from the top: */
63 fe621944 2020-11-10 stsp .inner_algo = &myers_then_myers_divide,
64 fe621944 2020-11-10 stsp /* (fallback_algo = NULL implies diff_algo_none). */
65 8020fd50 2017-11-29 stsp };
66 574ed2c3 2017-11-29 stsp
67 fe621944 2020-11-10 stsp /* If the state for a forward-Myers is small enough, use Myers, otherwise first
68 fe621944 2020-11-10 stsp * do a Myers-divide. */
69 fe621944 2020-11-10 stsp const struct diff_config diff_config_myers_then_myers_divide = {
70 fe621944 2020-11-10 stsp .atomize_func = diff_atomize_text_by_line,
71 fe621944 2020-11-10 stsp .algo = &myers_then_myers_divide,
72 fe621944 2020-11-10 stsp };
73 574ed2c3 2017-11-29 stsp
74 fe621944 2020-11-10 stsp /* If the state for a forward-Myers is small enough, use Myers, otherwise first
75 fe621944 2020-11-10 stsp * do a Patience. */
76 fe621944 2020-11-10 stsp const struct diff_config diff_config_myers_then_patience = {
77 fe621944 2020-11-10 stsp .atomize_func = diff_atomize_text_by_line,
78 fe621944 2020-11-10 stsp .algo = &myers_then_patience,
79 574ed2c3 2017-11-29 stsp };
80 574ed2c3 2017-11-29 stsp
81 fe621944 2020-11-10 stsp /* Directly force Patience as a first divider of the source file. */
82 fe621944 2020-11-10 stsp const struct diff_config diff_config_patience = {
83 fe621944 2020-11-10 stsp .atomize_func = diff_atomize_text_by_line,
84 fe621944 2020-11-10 stsp .algo = &patience,
85 574ed2c3 2017-11-29 stsp };
86 574ed2c3 2017-11-29 stsp
87 fe621944 2020-11-10 stsp /* Directly force Patience as a first divider of the source file. */
88 fe621944 2020-11-10 stsp const struct diff_config diff_config_no_algo = {
89 fe621944 2020-11-10 stsp .atomize_func = diff_atomize_text_by_line,
90 fe621944 2020-11-10 stsp };
91 fe621944 2020-11-10 stsp
92 fe621944 2020-11-10 stsp const struct got_error *
93 fe621944 2020-11-10 stsp got_diffreg_close(FILE *f1, char *p1, size_t size1,
94 fe621944 2020-11-10 stsp FILE *f2, char *p2, size_t size2)
95 cb74ff21 2017-11-30 stsp {
96 fe621944 2020-11-10 stsp const struct got_error *err = NULL;
97 cb74ff21 2017-11-30 stsp
98 fe621944 2020-11-10 stsp if (p1 && munmap(p1, size1) == -1 && err == NULL)
99 fe621944 2020-11-10 stsp err = got_error_from_errno("munmap");
100 fe621944 2020-11-10 stsp if (p2 && munmap(p2, size2) == -1 && err == NULL)
101 fe621944 2020-11-10 stsp err = got_error_from_errno("munmap");
102 56b63ca4 2021-01-22 stsp if (f1 && fclose(f1) == EOF && err == NULL)
103 fe621944 2020-11-10 stsp err = got_error_from_errno("fclose");
104 56b63ca4 2021-01-22 stsp if (f2 && fclose(f2) == EOF && err == NULL)
105 fe621944 2020-11-10 stsp err = got_error_from_errno("fclose");
106 fe621944 2020-11-10 stsp return err;
107 dc424a06 2019-08-07 stsp }
108 dc424a06 2019-08-07 stsp
109 cca5682e 2020-11-18 stsp const struct got_error *
110 cca5682e 2020-11-18 stsp got_diff_get_config(struct diff_config **cfg,
111 cca5682e 2020-11-18 stsp enum got_diff_algorithm algorithm,
112 cca5682e 2020-11-18 stsp diff_atomize_func_t atomize_func, void *atomize_func_data)
113 dc424a06 2019-08-07 stsp {
114 cca5682e 2020-11-18 stsp *cfg = calloc(1, sizeof(**cfg));
115 cca5682e 2020-11-18 stsp if (*cfg == NULL)
116 cca5682e 2020-11-18 stsp return got_error_from_errno("calloc");
117 cca5682e 2020-11-18 stsp
118 fe621944 2020-11-10 stsp switch (algorithm) {
119 fe621944 2020-11-10 stsp case GOT_DIFF_ALGORITHM_PATIENCE:
120 cca5682e 2020-11-18 stsp (*cfg)->algo = &patience;
121 cca5682e 2020-11-18 stsp break;
122 fe621944 2020-11-10 stsp case GOT_DIFF_ALGORITHM_MYERS:
123 cca5682e 2020-11-18 stsp (*cfg)->algo = &myers_then_myers_divide;
124 cca5682e 2020-11-18 stsp break;
125 cca5682e 2020-11-18 stsp default:
126 cca5682e 2020-11-18 stsp return got_error_msg(GOT_ERR_NOT_IMPL, "bad diff algorithm");
127 fe621944 2020-11-10 stsp }
128 cca5682e 2020-11-18 stsp
129 cca5682e 2020-11-18 stsp if (atomize_func) {
130 cca5682e 2020-11-18 stsp (*cfg)->atomize_func = atomize_func;
131 cca5682e 2020-11-18 stsp (*cfg)->atomize_func_data = atomize_func_data;
132 cca5682e 2020-11-18 stsp } else
133 cca5682e 2020-11-18 stsp (*cfg)->atomize_func = diff_atomize_text_by_line;
134 cca5682e 2020-11-18 stsp
135 cca5682e 2020-11-18 stsp (*cfg)->max_recursion_depth = 0; /* use default recursion depth */
136 cca5682e 2020-11-18 stsp
137 cca5682e 2020-11-18 stsp return NULL;
138 cb74ff21 2017-11-30 stsp }
139 cb74ff21 2017-11-30 stsp
140 7d283eee 2017-11-29 stsp const struct got_error *
141 72254787 2020-11-18 stsp got_diff_prepare_file(FILE *f, char **p, size_t *size,
142 fe621944 2020-11-10 stsp struct diff_data *diff_data, const struct diff_config *cfg,
143 64453f7e 2020-11-21 stsp int ignore_whitespace, int force_text_diff)
144 574ed2c3 2017-11-29 stsp {
145 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
146 fe621944 2020-11-10 stsp struct stat st;
147 fe621944 2020-11-10 stsp int diff_flags = 0, rc;
148 7d283eee 2017-11-29 stsp
149 fe621944 2020-11-10 stsp *size = 0;
150 fe621944 2020-11-10 stsp
151 fe621944 2020-11-10 stsp diff_flags |= DIFF_FLAG_SHOW_PROTOTYPES;
152 fe621944 2020-11-10 stsp if (ignore_whitespace)
153 fe621944 2020-11-10 stsp diff_flags |= DIFF_FLAG_IGNORE_WHITESPACE;
154 64453f7e 2020-11-21 stsp if (force_text_diff)
155 64453f7e 2020-11-21 stsp diff_flags |= DIFF_FLAG_FORCE_TEXT_DATA;
156 fe621944 2020-11-10 stsp
157 72254787 2020-11-18 stsp if (fstat(fileno(f), &st) == -1) {
158 72254787 2020-11-18 stsp err = got_error_from_errno("fstat");
159 72254787 2020-11-18 stsp goto done;
160 fe621944 2020-11-10 stsp }
161 72254787 2020-11-18 stsp #ifndef GOT_DIFF_NO_MMAP
162 72254787 2020-11-18 stsp *p = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE,
163 72254787 2020-11-18 stsp fileno(f), 0);
164 72254787 2020-11-18 stsp if (*p == MAP_FAILED)
165 72254787 2020-11-18 stsp #endif
166 72254787 2020-11-18 stsp *p = NULL; /* fall back on file I/O */
167 fe621944 2020-11-10 stsp
168 72254787 2020-11-18 stsp rc = diff_atomize_file(diff_data, cfg, f, *p, st.st_size, diff_flags);
169 fe621944 2020-11-10 stsp if (rc) {
170 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_atomize_file");
171 fe621944 2020-11-10 stsp goto done;
172 fe621944 2020-11-10 stsp }
173 fe621944 2020-11-10 stsp done:
174 fe621944 2020-11-10 stsp if (err)
175 fe621944 2020-11-10 stsp diff_data_free(diff_data);
176 574ed2c3 2017-11-29 stsp else
177 fe621944 2020-11-10 stsp *size = st.st_size;
178 fe621944 2020-11-10 stsp return err;
179 fe621944 2020-11-10 stsp }
180 fe621944 2020-11-10 stsp
181 fe621944 2020-11-10 stsp const struct got_error *
182 fe621944 2020-11-10 stsp got_diffreg(struct got_diffreg_result **diffreg_result, FILE *f1, FILE *f2,
183 64453f7e 2020-11-21 stsp enum got_diff_algorithm algorithm, int ignore_whitespace,
184 64453f7e 2020-11-21 stsp int force_text_diff)
185 fe621944 2020-11-10 stsp {
186 fe621944 2020-11-10 stsp const struct got_error *err = NULL;
187 cca5682e 2020-11-18 stsp struct diff_config *cfg = NULL;
188 fe621944 2020-11-10 stsp char *p1 = NULL, *p2 = NULL;
189 fe621944 2020-11-10 stsp int f1_created = 0, f2_created = 0;
190 fe621944 2020-11-10 stsp size_t size1, size2;
191 fe621944 2020-11-10 stsp struct diff_data d_left, d_right;
192 fe621944 2020-11-10 stsp struct diff_data *left, *right;
193 fe621944 2020-11-10 stsp struct diff_result *diff_result;
194 574ed2c3 2017-11-29 stsp
195 fe621944 2020-11-10 stsp if (diffreg_result) {
196 fe621944 2020-11-10 stsp *diffreg_result = calloc(1, sizeof(**diffreg_result));
197 fe621944 2020-11-10 stsp if (*diffreg_result == NULL)
198 fe621944 2020-11-10 stsp return got_error_from_errno("calloc");
199 fe621944 2020-11-10 stsp left = &(*diffreg_result)->left;
200 fe621944 2020-11-10 stsp right = &(*diffreg_result)->right;
201 fe621944 2020-11-10 stsp } else {
202 fe621944 2020-11-10 stsp memset(&d_left, 0, sizeof(d_left));
203 fe621944 2020-11-10 stsp memset(&d_right, 0, sizeof(d_right));
204 fe621944 2020-11-10 stsp left = &d_left;
205 fe621944 2020-11-10 stsp right = &d_right;
206 574ed2c3 2017-11-29 stsp }
207 72254787 2020-11-18 stsp
208 cca5682e 2020-11-18 stsp err = got_diff_get_config(&cfg, algorithm, NULL, NULL);
209 cca5682e 2020-11-18 stsp if (err)
210 fe621944 2020-11-10 stsp goto done;
211 574ed2c3 2017-11-29 stsp
212 72254787 2020-11-18 stsp if (f1 == NULL) {
213 72254787 2020-11-18 stsp f1_created = 1;
214 72254787 2020-11-18 stsp f1 = got_opentemp();
215 72254787 2020-11-18 stsp if (f1 == NULL) {
216 72254787 2020-11-18 stsp err = got_error_from_errno("got_opentemp");
217 72254787 2020-11-18 stsp goto done;
218 72254787 2020-11-18 stsp }
219 72254787 2020-11-18 stsp }
220 72254787 2020-11-18 stsp if (f2 == NULL) {
221 72254787 2020-11-18 stsp f2_created = 1;
222 72254787 2020-11-18 stsp f2 = got_opentemp();
223 72254787 2020-11-18 stsp if (f2 == NULL) {
224 72254787 2020-11-18 stsp err = got_error_from_errno("got_opentemp");
225 72254787 2020-11-18 stsp goto done;
226 72254787 2020-11-18 stsp }
227 72254787 2020-11-18 stsp }
228 72254787 2020-11-18 stsp
229 72254787 2020-11-18 stsp err = got_diff_prepare_file(f1, &p1, &size1, left, cfg,
230 64453f7e 2020-11-21 stsp ignore_whitespace, force_text_diff);
231 fe621944 2020-11-10 stsp if (err)
232 fe621944 2020-11-10 stsp goto done;
233 574ed2c3 2017-11-29 stsp
234 72254787 2020-11-18 stsp err = got_diff_prepare_file(f2, &p2, &size2, right, cfg,
235 64453f7e 2020-11-21 stsp ignore_whitespace, force_text_diff);
236 fe621944 2020-11-10 stsp if (err)
237 fe621944 2020-11-10 stsp goto done;
238 574ed2c3 2017-11-29 stsp
239 fe621944 2020-11-10 stsp diff_result = diff_main(cfg, left, right);
240 fe621944 2020-11-10 stsp if (diff_result == NULL) {
241 fe621944 2020-11-10 stsp err = got_error_set_errno(ENOMEM, "malloc");
242 fe621944 2020-11-10 stsp goto done;
243 322260e1 2018-01-26 mpi }
244 fe621944 2020-11-10 stsp if (diff_result->rc != DIFF_RC_OK) {
245 fe621944 2020-11-10 stsp err = got_error_set_errno(diff_result->rc, "diff");
246 fe621944 2020-11-10 stsp goto done;
247 7d283eee 2017-11-29 stsp }
248 574ed2c3 2017-11-29 stsp
249 fe621944 2020-11-10 stsp if (diffreg_result) {
250 fe621944 2020-11-10 stsp (*diffreg_result)->result = diff_result;
251 fe621944 2020-11-10 stsp if (f1_created)
252 fe621944 2020-11-10 stsp (*diffreg_result)->f1 = f1;
253 fe621944 2020-11-10 stsp (*diffreg_result)->map1 = p1;
254 fe621944 2020-11-10 stsp (*diffreg_result)->size1 = size1;
255 fe621944 2020-11-10 stsp if (f2_created)
256 fe621944 2020-11-10 stsp (*diffreg_result)->f2 = f2;
257 fe621944 2020-11-10 stsp (*diffreg_result)->map2 = p2;
258 fe621944 2020-11-10 stsp (*diffreg_result)->size2 = size2;
259 7d283eee 2017-11-29 stsp }
260 fe621944 2020-11-10 stsp done:
261 cca5682e 2020-11-18 stsp free(cfg);
262 fe621944 2020-11-10 stsp if (diffreg_result == NULL) {
263 fe621944 2020-11-10 stsp diff_data_free(left);
264 fe621944 2020-11-10 stsp diff_data_free(right);
265 7d283eee 2017-11-29 stsp }
266 fe621944 2020-11-10 stsp if (err) {
267 fe621944 2020-11-10 stsp got_diffreg_close(f1_created ? f1 : NULL, p1, size1,
268 fe621944 2020-11-10 stsp f2_created ? f2 : NULL, p2, size2);
269 fe621944 2020-11-10 stsp if (diffreg_result) {
270 fe621944 2020-11-10 stsp diff_data_free(left);
271 fe621944 2020-11-10 stsp diff_data_free(right);
272 fe621944 2020-11-10 stsp free(*diffreg_result);
273 fe621944 2020-11-10 stsp *diffreg_result = NULL;
274 fe621944 2020-11-10 stsp }
275 322260e1 2018-01-26 mpi }
276 fe621944 2020-11-10 stsp
277 fe621944 2020-11-10 stsp return err;
278 574ed2c3 2017-11-29 stsp }
279 574ed2c3 2017-11-29 stsp
280 fe621944 2020-11-10 stsp const struct got_error *
281 fe621944 2020-11-10 stsp got_diffreg_output(off_t **line_offsets, size_t *nlines,
282 1cb46f00 2020-11-21 stsp struct got_diffreg_result *diff_result, int f1_exists, int f2_exists,
283 fe621944 2020-11-10 stsp const char *path1, const char *path2,
284 fe621944 2020-11-10 stsp enum got_diff_output_format output_format, int context_lines, FILE *outfile)
285 574ed2c3 2017-11-29 stsp {
286 fe621944 2020-11-10 stsp struct diff_input_info info = {
287 fe621944 2020-11-10 stsp .left_path = path1,
288 fe621944 2020-11-10 stsp .right_path = path2,
289 1cb46f00 2020-11-21 stsp .flags = 0,
290 fe621944 2020-11-10 stsp };
291 fe621944 2020-11-10 stsp int rc;
292 fe621944 2020-11-10 stsp struct diff_output_info *output_info;
293 1cb46f00 2020-11-21 stsp
294 1cb46f00 2020-11-21 stsp if (!f1_exists)
295 1cb46f00 2020-11-21 stsp info.flags |= DIFF_INPUT_LEFT_NONEXISTENT;
296 1cb46f00 2020-11-21 stsp if (!f2_exists)
297 1cb46f00 2020-11-21 stsp info.flags |= DIFF_INPUT_RIGHT_NONEXISTENT;
298 574ed2c3 2017-11-29 stsp
299 fe621944 2020-11-10 stsp switch (output_format) {
300 fe621944 2020-11-10 stsp case GOT_DIFF_OUTPUT_UNIDIFF:
301 fe621944 2020-11-10 stsp rc = diff_output_unidiff(
302 fe621944 2020-11-10 stsp line_offsets ? &output_info : NULL, outfile, &info,
303 fe621944 2020-11-10 stsp diff_result->result, context_lines);
304 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK)
305 fe621944 2020-11-10 stsp return got_error_set_errno(rc, "diff_output_unidiff");
306 fe621944 2020-11-10 stsp break;
307 fe621944 2020-11-10 stsp case GOT_DIFF_OUTPUT_EDSCRIPT:
308 fe621944 2020-11-10 stsp rc = diff_output_edscript(line_offsets ? &output_info : NULL,
309 fe621944 2020-11-10 stsp outfile, &info, diff_result->result);
310 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK)
311 fe621944 2020-11-10 stsp return got_error_set_errno(rc, "diff_output_edscript");
312 fe621944 2020-11-10 stsp break;
313 fe621944 2020-11-10 stsp
314 574ed2c3 2017-11-29 stsp }
315 574ed2c3 2017-11-29 stsp
316 fe621944 2020-11-10 stsp if (line_offsets && *line_offsets) {
317 fe621944 2020-11-10 stsp if (output_info->line_offsets.len > 0) {
318 fe621944 2020-11-10 stsp off_t prev_offset = 0, *p, *o;
319 fe621944 2020-11-10 stsp int i, len;
320 fe621944 2020-11-10 stsp if (*nlines > 0) {
321 fe621944 2020-11-10 stsp prev_offset = (*line_offsets)[*nlines - 1];
322 fe621944 2020-11-10 stsp /*
323 fe621944 2020-11-10 stsp * First line offset is always zero. Skip it
324 fe621944 2020-11-10 stsp * when appending to a pre-populated array.
325 fe621944 2020-11-10 stsp */
326 fe621944 2020-11-10 stsp o = &output_info->line_offsets.head[1];
327 fe621944 2020-11-10 stsp len = output_info->line_offsets.len - 1;
328 fe621944 2020-11-10 stsp } else {
329 fe621944 2020-11-10 stsp o = &output_info->line_offsets.head[0];
330 fe621944 2020-11-10 stsp len = output_info->line_offsets.len;
331 df51fc4e 2018-04-02 stsp }
332 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + len,
333 fe621944 2020-11-10 stsp sizeof(off_t));
334 fe621944 2020-11-10 stsp if (p == NULL)
335 fe621944 2020-11-10 stsp return got_error_from_errno("calloc");
336 fe621944 2020-11-10 stsp for (i = 0; i < len; i++)
337 fe621944 2020-11-10 stsp p[*nlines + i] = o[i] + prev_offset;
338 fe621944 2020-11-10 stsp *line_offsets = p;
339 fe621944 2020-11-10 stsp *nlines += len;
340 574ed2c3 2017-11-29 stsp }
341 fe621944 2020-11-10 stsp diff_output_info_free(output_info);
342 574ed2c3 2017-11-29 stsp }
343 322260e1 2018-01-26 mpi
344 fe621944 2020-11-10 stsp return NULL;
345 574ed2c3 2017-11-29 stsp }
346 574ed2c3 2017-11-29 stsp
347 fe621944 2020-11-10 stsp const struct got_error *
348 fe621944 2020-11-10 stsp got_diffreg_result_free(struct got_diffreg_result *diffreg_result)
349 574ed2c3 2017-11-29 stsp {
350 fe621944 2020-11-10 stsp const struct got_error *err;
351 574ed2c3 2017-11-29 stsp
352 fe621944 2020-11-10 stsp diff_result_free(diffreg_result->result);
353 fe621944 2020-11-10 stsp diff_data_free(&diffreg_result->left);
354 fe621944 2020-11-10 stsp diff_data_free(&diffreg_result->right);
355 fe621944 2020-11-10 stsp err = got_diffreg_close(diffreg_result->f1, diffreg_result->map1,
356 fe621944 2020-11-10 stsp diffreg_result->size1, diffreg_result->f2,
357 fe621944 2020-11-10 stsp diffreg_result->map2, diffreg_result->size2);
358 fe621944 2020-11-10 stsp free(diffreg_result);
359 fe621944 2020-11-10 stsp return err;
360 574ed2c3 2017-11-29 stsp }
361 574ed2c3 2017-11-29 stsp
362 fe621944 2020-11-10 stsp const struct got_error *
363 fe621944 2020-11-10 stsp got_diffreg_result_free_left(struct got_diffreg_result *diffreg_result)
364 574ed2c3 2017-11-29 stsp {
365 fe621944 2020-11-10 stsp diff_data_free(&diffreg_result->left);
366 fe621944 2020-11-10 stsp memset(&diffreg_result->left, 0, sizeof(diffreg_result->left));
367 fe621944 2020-11-10 stsp return got_diffreg_close(diffreg_result->f1, diffreg_result->map1,
368 fe621944 2020-11-10 stsp diffreg_result->size1, NULL, NULL, 0);
369 574ed2c3 2017-11-29 stsp }
370 574ed2c3 2017-11-29 stsp
371 fe621944 2020-11-10 stsp const struct got_error *
372 fe621944 2020-11-10 stsp got_diffreg_result_free_right(struct got_diffreg_result *diffreg_result)
373 574ed2c3 2017-11-29 stsp {
374 fe621944 2020-11-10 stsp diff_data_free(&diffreg_result->right);
375 fe621944 2020-11-10 stsp memset(&diffreg_result->right, 0, sizeof(diffreg_result->right));
376 fe621944 2020-11-10 stsp return got_diffreg_close(NULL, NULL, 0, diffreg_result->f2,
377 fe621944 2020-11-10 stsp diffreg_result->map2, diffreg_result->size2);
378 dc424a06 2019-08-07 stsp }