Gotweb

Blob

Date:: Tue Apr 24 11:49:33 2018 UTC
Message:: don't override error codes in diff_modified_blob()
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
3  *
4  * Permission to use, copy, modify, and distribute this software for any
5  * purpose with or without fee is hereby granted, provided that the above
6  * copyright notice and this permission notice appear in all copies.
7  *
8  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15  */
16 
17 #include <sys/queue.h>
18 #include <sys/stat.h>
19 
20 #include <stdio.h>
21 #include <stdlib.h>
22 #include <string.h>
23 #include <limits.h>
24 #include <sha1.h>
25 #include <zlib.h>
26 
27 #include "got_repository.h"
28 #include "got_object.h"
29 #include "got_error.h"
30 #include "got_diff.h"
31 
32 #include "got_lib_diff.h"
33 #include "got_lib_path.h"
34 
35 const struct got_error *
36 got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
37     const char *label1, const char *label2, FILE *outfile)
38 {
39 	struct got_diff_state ds;
40 	struct got_diff_args args;
41 	const struct got_error *err = NULL;
42 	FILE *f1 = NULL, *f2 = NULL;
43 	char hex1[SHA1_DIGEST_STRING_LENGTH];
44 	char hex2[SHA1_DIGEST_STRING_LENGTH];
45 	char *idstr1 = NULL, *idstr2 = NULL;
46 	size_t len, hdrlen;
47 	size_t size1, size2;
48 	int res, flags = 0;
49 
50 	if (blob1) {
51 		f1 = got_opentemp();
52 		if (f1 == NULL)
53 			return got_error(GOT_ERR_FILE_OPEN);
54 	} else
55 		flags |= D_EMPTY1;
56 
57 	if (blob2) {
58 		f2 = got_opentemp();
59 		if (f2 == NULL) {
60 			fclose(f1);
61 			return got_error(GOT_ERR_FILE_OPEN);
62 		}
63 	} else
64 		flags |= D_EMPTY2;
65 
66 	size1 = 0;
67 	if (blob1) {
68 		idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
69 		hdrlen = got_object_blob_get_hdrlen(blob1);
70 		do {
71 			err = got_object_blob_read_block(&len, blob1);
72 			if (err)
73 				goto done;
74 			if (len == 0)
75 				break;
76 			size1 += len;
77 			/* Skip blob object header first time around. */
78 			fwrite(got_object_blob_get_read_buf(blob1) + hdrlen,
79 			    len - hdrlen, 1, f1);
80 			hdrlen = 0;
81 		} while (len != 0);
82 	} else
83 		idstr1 = "/dev/null";
84 
85 	size2 = 0;
86 	if (blob2) {
87 		idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
88 		hdrlen = got_object_blob_get_hdrlen(blob2);
89 		do {
90 			err = got_object_blob_read_block(&len, blob2);
91 			if (err)
92 				goto done;
93 			if (len == 0)
94 				break;
95 			size2 += len;
96 			/* Skip blob object header first time around. */
97 			fwrite(got_object_blob_get_read_buf(blob2) + hdrlen,
98 			    len - hdrlen, 1, f2);
99 			hdrlen = 0;
100 		} while (len != 0);
101 	} else
102 		idstr2 = "/dev/null";
103 
104 	if (f1) {
105 		fflush(f1);
106 		rewind(f1);
107 	}
108 	if (f2) {
109 		fflush(f2);
110 		rewind(f2);
111 	}
112 
113 	memset(&ds, 0, sizeof(ds));
114 	/* XXX should stat buffers be passed in args instead of ds? */
115 	ds.stb1.st_mode = S_IFREG;
116 	if (blob1)
117 		ds.stb1.st_size = size1;
118 	ds.stb1.st_mtime = 0; /* XXX */
119 
120 	ds.stb2.st_mode = S_IFREG;
121 	if (blob2)
122 		ds.stb2.st_size = size2;
123 	ds.stb2.st_mtime = 0; /* XXX */
124 
125 	memset(&args, 0, sizeof(args));
126 	args.diff_format = D_UNIFIED;
127 	args.label[0] = label1 ? label1 : idstr1;
128 	args.label[1] = label2 ? label2 : idstr2;
129 	args.diff_context = 3;
130 	flags |= D_PROTOTYPE;
131 
132 	err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
133 done:
134 	if (f1)
135 		fclose(f1);
136 	if (f2)
137 		fclose(f2);
138 	return err;
139 }
140 
141 struct got_tree_entry *
142 match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
143 {
144 	struct got_tree_entry *te2;
145 
146 	SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
147 		if (strcmp(te1->name, te2->name) == 0)
148 			return te2;
149 	}
150 	return NULL;
151 }
152 
153 static const struct got_error *
154 diff_added_blob(struct got_object_id *id, struct got_repository *repo,
155     FILE *outfile)
156 {
157 	const struct got_error *err;
158 	struct got_blob_object  *blob = NULL;
159 	struct got_object *obj = NULL;
160 
161 	err = got_object_open(&obj, repo, id);
162 	if (err)
163 		return err;
164 
165 	err = got_object_blob_open(&blob, repo, obj, 8192);
166 	if (err)
167 		goto done;
168 	err = got_diff_blob(NULL, blob, NULL, NULL, outfile);
169 done:
170 	got_object_close(obj);
171 	if (blob)
172 		got_object_blob_close(blob);
173 	return err;
174 }
175 
176 static const struct got_error *
177 diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
178     struct got_repository *repo, FILE *outfile)
179 {
180 	const struct got_error *err;
181 	struct got_object *obj1 = NULL;
182 	struct got_object *obj2 = NULL;
183 	struct got_blob_object *blob1 = NULL;
184 	struct got_blob_object *blob2 = NULL;
185 
186 	err = got_object_open(&obj1, repo, id1);
187 	if (err)
188 		return err;
189 	if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
190 		err = got_error(GOT_ERR_OBJ_TYPE);
191 		goto done;
192 	}
193 
194 	err = got_object_open(&obj2, repo, id2);
195 	if (err)
196 		goto done;
197 	if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
198 		err = got_error(GOT_ERR_BAD_OBJ_DATA);
199 		goto done;
200 	}
201 
202 	err = got_object_blob_open(&blob1, repo, obj1, 8192);
203 	if (err)
204 		goto done;
205 
206 	err = got_object_blob_open(&blob2, repo, obj2, 8192);
207 	if (err)
208 		goto done;
209 
210 	err = got_diff_blob(blob1, blob2, NULL, NULL, outfile);
211 
212 done:
213 	if (obj1)
214 		got_object_close(obj1);
215 	if (obj2)
216 		got_object_close(obj2);
217 	if (blob1)
218 		got_object_blob_close(blob1);
219 	if (blob2)
220 		got_object_blob_close(blob2);
221 	return err;
222 }
223 
224 static const struct got_error *
225 diff_deleted_blob(struct got_object_id *id, struct got_repository *repo,
226     FILE *outfile)
227 {
228 	const struct got_error *err;
229 	struct got_blob_object  *blob = NULL;
230 	struct got_object *obj = NULL;
231 
232 	err = got_object_open(&obj, repo, id);
233 	if (err)
234 		return err;
235 
236 	err = got_object_blob_open(&blob, repo, obj, 8192);
237 	if (err)
238 		goto done;
239 	err = got_diff_blob(blob, NULL, NULL, NULL, outfile);
240 done:
241 	got_object_close(obj);
242 	if (blob)
243 		got_object_blob_close(blob);
244 	return err;
245 }
246 
247 static const struct got_error *
248 diff_added_tree(struct got_object_id *id, struct got_repository *repo,
249     FILE *outfile)
250 {
251 	const struct got_error *err = NULL;
252 	struct got_object *treeobj = NULL;
253 	struct got_tree_object *tree = NULL;
254 
255 	err = got_object_open(&treeobj, repo, id);
256 	if (err)
257 		goto done;
258 
259 	if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
260 		err = got_error(GOT_ERR_OBJ_TYPE);
261 		goto done;
262 	}
263 
264 	err = got_object_tree_open(&tree, repo, treeobj);
265 	if (err)
266 		goto done;
267 
268 	err = got_diff_tree(NULL, tree, repo, outfile);
269 
270 done:
271 	if (tree)
272 		got_object_tree_close(tree);
273 	if (treeobj)
274 		got_object_close(treeobj);
275 	return err;
276 }
277 
278 static const struct got_error *
279 diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
280     struct got_repository *repo, FILE *outfile)
281 {
282 	const struct got_error *err = NULL;
283 	struct got_object *treeobj1 = NULL;
284 	struct got_object *treeobj2 = NULL;
285 	struct got_tree_object *tree1 = NULL;
286 	struct got_tree_object *tree2 = NULL;
287 
288 	err = got_object_open(&treeobj1, repo, id1);
289 	if (err)
290 		goto done;
291 
292 	if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
293 		err = got_error(GOT_ERR_OBJ_TYPE);
294 		goto done;
295 	}
296 
297 	err = got_object_open(&treeobj2, repo, id2);
298 	if (err)
299 		goto done;
300 
301 	if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
302 		err = got_error(GOT_ERR_OBJ_TYPE);
303 		goto done;
304 	}
305 
306 	err = got_object_tree_open(&tree1, repo, treeobj1);
307 	if (err)
308 		goto done;
309 
310 	err = got_object_tree_open(&tree2, repo, treeobj2);
311 	if (err)
312 		goto done;
313 
314 	err = got_diff_tree(tree1, tree2, repo, outfile);
315 
316 done:
317 	if (tree1)
318 		got_object_tree_close(tree1);
319 	if (tree2)
320 		got_object_tree_close(tree2);
321 	if (treeobj1)
322 		got_object_close(treeobj1);
323 	if (treeobj2)
324 		got_object_close(treeobj2);
325 	return err;
326 }
327 
328 static const struct got_error *
329 diff_deleted_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
330 {
331 	const struct got_error *err = NULL;
332 	struct got_object *treeobj = NULL;
333 	struct got_tree_object *tree = NULL;
334 
335 	err = got_object_open(&treeobj, repo, id);
336 	if (err)
337 		goto done;
338 
339 	if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
340 		err = got_error(GOT_ERR_OBJ_TYPE);
341 		goto done;
342 	}
343 
344 	err = got_object_tree_open(&tree, repo, treeobj);
345 	if (err)
346 		goto done;
347 
348 	err = got_diff_tree(tree, NULL, repo, outfile);
349 
350 done:
351 	if (tree)
352 		got_object_tree_close(tree);
353 	if (treeobj)
354 		got_object_close(treeobj);
355 	return err;
356 }
357 
358 static const struct got_error *
359 diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
360     FILE *outfile)
361 {
362 	/* XXX TODO */
363 	return NULL;
364 }
365 
366 static const struct got_error *
367 diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
368     struct got_repository *repo, FILE *outfile)
369 {
370 	struct got_tree_entry *te2 = NULL;
371 
372 	if (tree2)
373 		te2 = match_entry_by_name(te1, tree2);
374 	if (te2 == NULL) {
375 		if (S_ISDIR(te1->mode))
376 			return diff_deleted_tree(te1->id, repo, outfile);
377 		return diff_deleted_blob(te1->id, repo, outfile);
378 	}
379 
380 	if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
381 		if (got_object_id_cmp(te1->id, te2->id) != 0)
382 			return diff_modified_tree(te1->id, te2->id, repo,
383 			    outfile);
384 	} else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
385 		if (got_object_id_cmp(te1->id, te2->id) != 0)
386 			return diff_modified_blob(te1->id, te2->id, repo,
387 			    outfile);
388 	}
389 
390 	return diff_kind_mismatch(te1->id, te2->id, outfile);
391 }
392 
393 static const struct got_error *
394 diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
395     struct got_repository *repo, FILE *outfile)
396 {
397 	if (tree1) {
398 		struct got_tree_entry *te1 = match_entry_by_name(te2, tree1);
399 		if (te1 != NULL) /* handled by diff_entry_old_new() */
400 			return NULL;
401 	}
402 
403 	if (S_ISDIR(te2->mode))
404 		return diff_added_tree(te2->id, repo, outfile);
405 	return diff_added_blob(te2->id, repo, outfile);
406 }
407 
408 const struct got_error *
409 got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
410     struct got_repository *repo, FILE *outfile)
411 {
412 	const struct got_error *err = NULL;
413 	struct got_tree_entry *te1 = NULL;
414 	struct got_tree_entry *te2 = NULL;
415 
416 	if (tree1)
417 		te1 = SIMPLEQ_FIRST(&tree1->entries);
418 	if (tree2)
419 		te2 = SIMPLEQ_FIRST(&tree2->entries);
420 
421 	do {
422 		if (te1) {
423 			err = diff_entry_old_new(te1, tree2, repo, outfile);
424 			if (err)
425 				break;
426 		}
427 
428 		if (te2) {
429 			err = diff_entry_new_old(te2, tree1, repo, outfile);
430 			if (err)
431 				break;
432 		}
433 
434 		if (te1)
435 			te1 = SIMPLEQ_NEXT(te1, entry);
436 		if (te2)
437 			te2 = SIMPLEQ_NEXT(te2, entry);
438 	} while (te1 || te2);
439 
440 	return err;
441 }