Gotweb

Blob

Date:: Tue Mar 27 21:18:58 2018 UTC
Message:: show function prototypes in diff output
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, len - hdrlen, 1, f1);
79 			hdrlen = 0;
80 		} while (len != 0);
81 	} else
82 		idstr1 = "/dev/null";
83 
84 	size2 = 0;
85 	if (blob2) {
86 		idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
87 		hdrlen = got_object_blob_get_hdrlen(blob2);
88 		do {
89 			err = got_object_blob_read_block(&len, blob2);
90 			if (err)
91 				goto done;
92 			if (len == 0)
93 				break;
94 			size2 += len;
95 			/* Skip blob object header first time around. */
96 			fwrite(got_object_blob_get_read_buf(blob2) + hdrlen, len - hdrlen, 1, f2);
97 			hdrlen = 0;
98 		} while (len != 0);
99 	} else
100 		idstr2 = "/dev/null";
101 
102 	if (f1) {
103 		fflush(f1);
104 		rewind(f1);
105 	}
106 	if (f2) {
107 		fflush(f2);
108 		rewind(f2);
109 	}
110 
111 	memset(&ds, 0, sizeof(ds));
112 	/* XXX should stat buffers be passed in args instead of ds? */
113 	ds.stb1.st_mode = S_IFREG;
114 	if (blob1)
115 		ds.stb1.st_size = size1;
116 	ds.stb1.st_mtime = 0; /* XXX */
117 
118 	ds.stb2.st_mode = S_IFREG;
119 	if (blob2)
120 		ds.stb2.st_size = size2;
121 	ds.stb2.st_mtime = 0; /* XXX */
122 
123 	memset(&args, 0, sizeof(args));
124 	args.diff_format = D_UNIFIED;
125 	args.label[0] = label1 ? label1 : idstr1;
126 	args.label[1] = label2 ? label2 : idstr2;
127 	args.diff_context = 3;
128 	flags |= D_PROTOTYPE;
129 
130 	err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
131 done:
132 	if (f1)
133 		fclose(f1);
134 	if (f2)
135 		fclose(f2);
136 	return err;
137 }
138 
139 struct got_tree_entry *
140 match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
141 {
142 	struct got_tree_entry *te2;
143 
144 	SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
145 		if (strcmp(te1->name, te2->name) == 0)
146 			return te2;
147 	}
148 	return NULL;
149 }
150 
151 static const struct got_error *
152 diff_added_blob(struct got_object_id *id, struct got_repository *repo,
153     FILE *outfile)
154 {
155 	const struct got_error *err;
156 	struct got_blob_object  *blob;
157 	struct got_object *obj;
158 
159 	err = got_object_open(&obj, repo, id);
160 	if (err)
161 		return err;
162 	err = got_object_blob_open(&blob, repo, obj, 8192);
163 	if (err != NULL)
164 		return err;
165 
166 	return got_diff_blob(NULL, blob, NULL, NULL, outfile);
167 }
168 
169 static const struct got_error *
170 diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
171     struct got_repository *repo, FILE *outfile)
172 {
173 	const struct got_error *err;
174 	struct got_object *obj1 = NULL;
175 	struct got_object *obj2 = NULL;
176 	struct got_blob_object *blob1 = NULL;
177 	struct got_blob_object *blob2 = NULL;
178 
179 	err = got_object_open(&obj1, repo, id1);
180 	if (err)
181 		return got_error(GOT_ERR_BAD_OBJ_HDR);
182 	if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
183 		err = got_error(GOT_ERR_OBJ_TYPE);
184 		goto done;
185 	}
186 
187 	err = got_object_open(&obj2, repo, id2);
188 	if (err) {
189 		err= got_error(GOT_ERR_BAD_OBJ_HDR);
190 		goto done;
191 	}
192 	if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
193 		err = got_error(GOT_ERR_BAD_OBJ_DATA);
194 		goto done;
195 	}
196 
197 	err = got_object_blob_open(&blob1, repo, obj1, 8192);
198 	if (err != NULL) {
199 		err = got_error(GOT_ERR_FILE_OPEN);
200 		goto done;
201 	}
202 
203 	err = got_object_blob_open(&blob2, repo, obj2, 8192);
204 	if (err != NULL) {
205 		err = got_error(GOT_ERR_FILE_OPEN);
206 		goto done;
207 	}
208 
209 	err = got_diff_blob(blob1, blob2, NULL, NULL, outfile);
210 
211 done:
212 	if (obj1)
213 		got_object_close(obj1);
214 	if (obj2)
215 		got_object_close(obj2);
216 	if (blob1)
217 		got_object_blob_close(blob1);
218 	if (blob2)
219 		got_object_blob_close(blob2);
220 	return err;
221 }
222 
223 static const struct got_error *
224 diff_deleted_blob(struct got_object_id *id, struct got_repository *repo,
225     FILE *outfile)
226 {
227 	const struct got_error *err;
228 	struct got_blob_object  *blob;
229 	struct got_object *obj;
230 
231 	err = got_object_open(&obj, repo, id);
232 	if (err)
233 		return err;
234 	err = got_object_blob_open(&blob, repo, obj, 8192);
235 	if (err != NULL)
236 		return err;
237 
238 	return got_diff_blob(blob, NULL, NULL, NULL, outfile);
239 }
240 
241 static const struct got_error *
242 diff_added_tree(struct got_object_id *id, struct got_repository *repo,
243     FILE *outfile)
244 {
245 	const struct got_error *err = NULL;
246 	struct got_object *treeobj = NULL;
247 	struct got_tree_object *tree = NULL;
248 
249 	err = got_object_open(&treeobj, repo, id);
250 	if (err)
251 		goto done;
252 
253 	if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
254 		err = got_error(GOT_ERR_OBJ_TYPE);
255 		goto done;
256 	}
257 
258 	err = got_object_tree_open(&tree, repo, treeobj);
259 	if (err)
260 		goto done;
261 
262 	err = got_diff_tree(NULL, tree, repo, outfile);
263 
264 done:
265 	if (tree)
266 		got_object_tree_close(tree);
267 	if (treeobj)
268 		got_object_close(treeobj);
269 	return err;
270 }
271 
272 static const struct got_error *
273 diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
274     struct got_repository *repo, FILE *outfile)
275 {
276 	const struct got_error *err = NULL;
277 	struct got_object *treeobj1 = NULL;
278 	struct got_object *treeobj2 = NULL;
279 	struct got_tree_object *tree1 = NULL;
280 	struct got_tree_object *tree2 = NULL;
281 
282 	err = got_object_open(&treeobj1, repo, id1);
283 	if (err)
284 		goto done;
285 
286 	if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
287 		err = got_error(GOT_ERR_OBJ_TYPE);
288 		goto done;
289 	}
290 
291 	err = got_object_open(&treeobj2, repo, id2);
292 	if (err)
293 		goto done;
294 
295 	if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
296 		err = got_error(GOT_ERR_OBJ_TYPE);
297 		goto done;
298 	}
299 
300 	err = got_object_tree_open(&tree1, repo, treeobj1);
301 	if (err)
302 		goto done;
303 
304 	err = got_object_tree_open(&tree2, repo, treeobj2);
305 	if (err)
306 		goto done;
307 
308 	err = got_diff_tree(tree1, tree2, repo, outfile);
309 
310 done:
311 	if (tree1)
312 		got_object_tree_close(tree1);
313 	if (tree2)
314 		got_object_tree_close(tree2);
315 	if (treeobj1)
316 		got_object_close(treeobj1);
317 	if (treeobj2)
318 		got_object_close(treeobj2);
319 	return err;
320 }
321 
322 static const struct got_error *
323 diff_deleted_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
324 {
325 	const struct got_error *err = NULL;
326 	struct got_object *treeobj = NULL;
327 	struct got_tree_object *tree = NULL;
328 
329 	err = got_object_open(&treeobj, repo, id);
330 	if (err)
331 		goto done;
332 
333 	if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
334 		err = got_error(GOT_ERR_OBJ_TYPE);
335 		goto done;
336 	}
337 
338 	err = got_object_tree_open(&tree, repo, treeobj);
339 	if (err)
340 		goto done;
341 
342 	err = got_diff_tree(tree, NULL, repo, outfile);
343 
344 done:
345 	if (tree)
346 		got_object_tree_close(tree);
347 	if (treeobj)
348 		got_object_close(treeobj);
349 	return err;
350 }
351 
352 static const struct got_error *
353 diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
354     FILE *outfile)
355 {
356 	/* XXX TODO */
357 	return NULL;
358 }
359 
360 static const struct got_error *
361 diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
362     struct got_repository *repo, FILE *outfile)
363 {
364 	struct got_tree_entry *te2 = NULL;
365 
366 	if (tree2)
367 		te2 = match_entry_by_name(te1, tree2);
368 	if (te2 == NULL) {
369 		if (S_ISDIR(te1->mode))
370 			return diff_deleted_tree(te1->id, repo, outfile);
371 		return diff_deleted_blob(te1->id, repo, outfile);
372 	}
373 
374 	if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
375 		if (got_object_id_cmp(te1->id, te2->id) != 0)
376 			return diff_modified_tree(te1->id, te2->id, repo,
377 			    outfile);
378 	} else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
379 		if (got_object_id_cmp(te1->id, te2->id) != 0)
380 			return diff_modified_blob(te1->id, te2->id, repo,
381 			    outfile);
382 	}
383 
384 	return diff_kind_mismatch(te1->id, te2->id, outfile);
385 }
386 
387 static const struct got_error *
388 diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
389     struct got_repository *repo, FILE *outfile)
390 {
391 	if (tree1) {
392 		struct got_tree_entry *te1 = match_entry_by_name(te2, tree1);
393 		if (te1 != NULL) /* handled by diff_entry_old_new() */
394 			return NULL;
395 	}
396 
397 	if (S_ISDIR(te2->mode))
398 		return diff_added_tree(te2->id, repo, outfile);
399 	return diff_added_blob(te2->id, repo, outfile);
400 }
401 
402 const struct got_error *
403 got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
404     struct got_repository *repo, FILE *outfile)
405 {
406 	const struct got_error *err = NULL;
407 	struct got_tree_entry *te1 = NULL;
408 	struct got_tree_entry *te2 = NULL;
409 
410 	if (tree1)
411 		te1 = SIMPLEQ_FIRST(&tree1->entries);
412 	if (tree2)
413 		te2 = SIMPLEQ_FIRST(&tree2->entries);
414 
415 	do {
416 		if (te1) {
417 			err = diff_entry_old_new(te1, tree2, repo, outfile);
418 			if (err)
419 				break;
420 		}
421 
422 		if (te2) {
423 			err = diff_entry_new_old(te2, tree1, repo, outfile);
424 			if (err)
425 				break;
426 		}
427 
428 		if (te1)
429 			te1 = SIMPLEQ_NEXT(te1, entry);
430 		if (te2)
431 			te2 = SIMPLEQ_NEXT(te2, entry);
432 	} while (te1 || te2);
433 
434 	return err;
435 }