2 7d283eee 2017-11-29 stsp * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 7d283eee 2017-11-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 7d283eee 2017-11-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 7d283eee 2017-11-29 stsp * copyright notice and this permission notice appear in all copies.
8 7d283eee 2017-11-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 7d283eee 2017-11-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 7d283eee 2017-11-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 7d283eee 2017-11-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 7d283eee 2017-11-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 7d283eee 2017-11-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 7d283eee 2017-11-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 7d283eee 2017-11-29 stsp #include <sys/queue.h>
18 1c7f0520 2017-11-29 stsp #include <sys/stat.h>
20 7d283eee 2017-11-29 stsp #include <stdio.h>
21 7d283eee 2017-11-29 stsp #include <stdlib.h>
22 7d283eee 2017-11-29 stsp #include <string.h>
23 f9d67749 2017-11-30 stsp #include <limits.h>
24 7d283eee 2017-11-29 stsp #include <sha1.h>
25 7d283eee 2017-11-29 stsp #include <zlib.h>
27 7d283eee 2017-11-29 stsp #include "got_repository.h"
28 7d283eee 2017-11-29 stsp #include "got_object.h"
29 7d283eee 2017-11-29 stsp #include "got_error.h"
30 789689b5 2017-11-30 stsp #include "got_diff.h"
32 7d283eee 2017-11-29 stsp #include "diff.h"
34 f9d67749 2017-11-30 stsp static FILE *
35 f9d67749 2017-11-30 stsp opentemp(void)
37 f9d67749 2017-11-30 stsp char name[PATH_MAX];
41 f9d67749 2017-11-30 stsp if (strlcpy(name, "/tmp/got.XXXXXXXX", sizeof(name)) >= sizeof(name))
42 f9d67749 2017-11-30 stsp return NULL;
44 f9d67749 2017-11-30 stsp fd = mkstemp(name);
46 f9d67749 2017-11-30 stsp return NULL;
48 f9d67749 2017-11-30 stsp unlink(name);
49 a7852263 2017-11-30 stsp f = fdopen(fd, "w+");
50 a7852263 2017-11-30 stsp if (f == NULL) {
52 a7852263 2017-11-30 stsp return NULL;
58 7d283eee 2017-11-29 stsp const struct got_error *
59 7d283eee 2017-11-29 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
60 474b4f94 2017-11-30 stsp const char *label1, const char *label2, FILE *outfile)
62 ed9e98a8 2017-11-29 stsp struct got_diff_state ds;
63 8ba9a219 2017-11-29 stsp struct got_diff_args args;
64 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
65 4e22badc 2017-11-30 stsp FILE *f1 = NULL, *f2 = NULL;
66 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
67 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
68 98abbc84 2017-11-30 stsp char *idstr1 = NULL, *idstr2 = NULL;
69 f9d67749 2017-11-30 stsp size_t len, hdrlen;
70 4e22badc 2017-11-30 stsp int res, flags = 0;
72 4e22badc 2017-11-30 stsp if (blob1) {
73 4e22badc 2017-11-30 stsp f1 = opentemp();
74 4e22badc 2017-11-30 stsp if (f1 == NULL)
75 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
77 4e22badc 2017-11-30 stsp flags |= D_EMPTY1;
79 4e22badc 2017-11-30 stsp if (blob2) {
80 4e22badc 2017-11-30 stsp f2 = opentemp();
81 4e22badc 2017-11-30 stsp if (f2 == NULL) {
83 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
86 4e22badc 2017-11-30 stsp flags |= D_EMPTY2;
88 98abbc84 2017-11-30 stsp if (blob1) {
89 98abbc84 2017-11-30 stsp idstr1 = got_object_id_str(&blob1->id, hex1, sizeof(hex1));
90 4e22badc 2017-11-30 stsp hdrlen = blob1->hdrlen;
92 4e22badc 2017-11-30 stsp err = got_object_blob_read_block(blob1, &len);
95 4e22badc 2017-11-30 stsp /* Skip blob object header first time around. */
96 4e22badc 2017-11-30 stsp fwrite(blob1->zb.outbuf + hdrlen, len - hdrlen, 1, f1);
98 4e22badc 2017-11-30 stsp } while (len != 0);
100 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
102 98abbc84 2017-11-30 stsp if (blob2) {
103 98abbc84 2017-11-30 stsp idstr2 = got_object_id_str(&blob2->id, hex2, sizeof(hex2));
104 98abbc84 2017-11-30 stsp hdrlen = blob2->hdrlen;
106 98abbc84 2017-11-30 stsp err = got_object_blob_read_block(blob2, &len);
109 98abbc84 2017-11-30 stsp /* Skip blob object header first time around. */
110 98abbc84 2017-11-30 stsp fwrite(blob2->zb.outbuf + hdrlen, len - hdrlen, 1, f2);
111 98abbc84 2017-11-30 stsp hdrlen = 0;
112 98abbc84 2017-11-30 stsp } while (len != 0);
114 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
117 98abbc84 2017-11-30 stsp fflush(f1);
119 98abbc84 2017-11-30 stsp fflush(f2);
121 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
122 f9d67749 2017-11-30 stsp /* XXX should stat buffers be passed in args instead of ds? */
123 f9d67749 2017-11-30 stsp ds.stb1.st_mode = S_IFREG;
125 98abbc84 2017-11-30 stsp ds.stb1.st_size = blob1->zb.z.total_out;
126 f9d67749 2017-11-30 stsp ds.stb1.st_mtime = 0; /* XXX */
128 f9d67749 2017-11-30 stsp ds.stb2.st_mode = S_IFREG;
130 98abbc84 2017-11-30 stsp ds.stb2.st_size = blob2->zb.z.total_out;
131 f9d67749 2017-11-30 stsp ds.stb2.st_mtime = 0; /* XXX */
133 f9d67749 2017-11-30 stsp memset(&args, 0, sizeof(args));
134 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
135 98abbc84 2017-11-30 stsp args.label[0] = label1 ? label1 : idstr1;
136 98abbc84 2017-11-30 stsp args.label[1] = label2 ? label2 : idstr2;
138 cb74ff21 2017-11-30 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
141 98abbc84 2017-11-30 stsp fclose(f1);
143 98abbc84 2017-11-30 stsp fclose(f2);
144 7d283eee 2017-11-29 stsp return err;
147 a3e2cbea 2017-12-01 stsp struct got_tree_entry *
148 a3e2cbea 2017-12-01 stsp match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
150 a3e2cbea 2017-12-01 stsp struct got_tree_entry *te2;
152 a3e2cbea 2017-12-01 stsp SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
153 a3e2cbea 2017-12-01 stsp if (strcmp(te1->name, te2->name) == 0)
154 a3e2cbea 2017-12-01 stsp return te2;
156 474b4f94 2017-11-30 stsp return NULL;
160 474b4f94 2017-11-30 stsp same_id(struct got_object_id *id1, struct got_object_id *id2)
162 474b4f94 2017-11-30 stsp return (memcmp(id1->sha1, id2->sha1, SHA1_DIGEST_LENGTH) == 0);
165 474b4f94 2017-11-30 stsp static const struct got_error *
166 4e22badc 2017-11-30 stsp diff_added_blob(struct got_object_id *id, struct got_repository *repo)
168 4e22badc 2017-11-30 stsp const struct got_error *err;
169 4e22badc 2017-11-30 stsp struct got_blob_object *blob;
170 4e22badc 2017-11-30 stsp struct got_object *obj;
172 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
174 4e22badc 2017-11-30 stsp return err;
175 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
176 4e22badc 2017-11-30 stsp if (err != NULL)
177 4e22badc 2017-11-30 stsp return err;
179 4e22badc 2017-11-30 stsp return got_diff_blob(NULL, blob, NULL, NULL, stdout);
182 474b4f94 2017-11-30 stsp static const struct got_error *
183 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
184 6a213ccb 2017-11-30 stsp struct got_repository *repo)
186 6a213ccb 2017-11-30 stsp const struct got_error *err;
187 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
188 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
189 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
190 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
192 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
194 6a213ccb 2017-11-30 stsp return got_error(GOT_ERR_BAD_OBJ_HDR);
195 6a213ccb 2017-11-30 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
196 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
200 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
202 6a213ccb 2017-11-30 stsp err= got_error(GOT_ERR_BAD_OBJ_HDR);
205 6a213ccb 2017-11-30 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
206 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
210 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
211 6a213ccb 2017-11-30 stsp if (err != NULL) {
212 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_FILE_OPEN);
216 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
217 6a213ccb 2017-11-30 stsp if (err != NULL) {
218 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_FILE_OPEN);
222 6a213ccb 2017-11-30 stsp err = got_diff_blob(blob1, blob2, NULL, NULL, stdout);
226 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
228 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
230 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
232 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
233 6a213ccb 2017-11-30 stsp return err;
236 474b4f94 2017-11-30 stsp static const struct got_error *
237 365fb436 2017-11-30 stsp diff_deleted_blob(struct got_object_id *id, struct got_repository *repo)
239 365fb436 2017-11-30 stsp const struct got_error *err;
240 365fb436 2017-11-30 stsp struct got_blob_object *blob;
241 365fb436 2017-11-30 stsp struct got_object *obj;
243 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
245 365fb436 2017-11-30 stsp return err;
246 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
247 365fb436 2017-11-30 stsp if (err != NULL)
248 365fb436 2017-11-30 stsp return err;
250 365fb436 2017-11-30 stsp return got_diff_blob(blob, NULL, NULL, NULL, stdout);
253 474b4f94 2017-11-30 stsp static const struct got_error *
254 9c70d4c3 2017-11-30 stsp diff_added_tree(struct got_object_id *id, struct got_repository *repo)
256 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
257 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
258 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
260 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
264 9c70d4c3 2017-11-30 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
265 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
269 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
273 9c70d4c3 2017-11-30 stsp err = got_diff_tree(NULL, tree, repo);
277 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
278 9c70d4c3 2017-11-30 stsp if (treeobj)
279 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
280 9c70d4c3 2017-11-30 stsp return err;
283 474b4f94 2017-11-30 stsp static const struct got_error *
284 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
285 789689b5 2017-11-30 stsp struct got_repository *repo)
287 789689b5 2017-11-30 stsp const struct got_error *err = NULL;
288 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
289 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
290 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
291 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
293 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
297 789689b5 2017-11-30 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
298 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
302 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
306 789689b5 2017-11-30 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
307 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
311 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
315 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
319 789689b5 2017-11-30 stsp err = got_diff_tree(tree1, tree2, repo);
323 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
325 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
326 789689b5 2017-11-30 stsp if (treeobj1)
327 789689b5 2017-11-30 stsp got_object_close(treeobj1);
328 789689b5 2017-11-30 stsp if (treeobj2)
329 789689b5 2017-11-30 stsp got_object_close(treeobj2);
330 789689b5 2017-11-30 stsp return err;
333 474b4f94 2017-11-30 stsp static const struct got_error *
334 2c56f2ce 2017-11-30 stsp diff_deleted_tree(struct got_object_id *id, struct got_repository *repo)
336 2c56f2ce 2017-11-30 stsp const struct got_error *err = NULL;
337 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
338 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
340 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
344 2c56f2ce 2017-11-30 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
345 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
349 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
353 2c56f2ce 2017-11-30 stsp err = got_diff_tree(tree, NULL, repo);
357 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
358 2c56f2ce 2017-11-30 stsp if (treeobj)
359 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
360 2c56f2ce 2017-11-30 stsp return err;
363 474b4f94 2017-11-30 stsp static const struct got_error *
364 474b4f94 2017-11-30 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2)
366 013404a9 2017-11-30 stsp /* XXX TODO */
367 474b4f94 2017-11-30 stsp return NULL;
370 474b4f94 2017-11-30 stsp static const struct got_error *
371 6a213ccb 2017-11-30 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
372 6a213ccb 2017-11-30 stsp struct got_repository *repo)
374 474b4f94 2017-11-30 stsp const struct got_error *err;
375 474b4f94 2017-11-30 stsp struct got_tree_entry *te2;
376 a3e2cbea 2017-12-01 stsp char hex[SHA1_DIGEST_STRING_LENGTH];
378 a3e2cbea 2017-12-01 stsp te2 = match_entry_by_name(te1, tree2);
379 474b4f94 2017-11-30 stsp if (te2 == NULL) {
380 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
381 2c56f2ce 2017-11-30 stsp return diff_deleted_tree(&te1->id, repo);
382 365fb436 2017-11-30 stsp return diff_deleted_blob(&te1->id, repo);
385 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
386 474b4f94 2017-11-30 stsp if (!same_id(&te1->id, &te2->id))
387 789689b5 2017-11-30 stsp return diff_modified_tree(&te1->id, &te2->id, repo);
388 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
389 474b4f94 2017-11-30 stsp if (!same_id(&te1->id, &te2->id))
390 6a213ccb 2017-11-30 stsp return diff_modified_blob(&te1->id, &te2->id, repo);
394 413ea19d 2017-11-30 stsp return diff_kind_mismatch(&te1->id, &te2->id);
397 474b4f94 2017-11-30 stsp static const struct got_error *
398 4e22badc 2017-11-30 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
399 4e22badc 2017-11-30 stsp struct got_repository *repo)
401 474b4f94 2017-11-30 stsp const struct got_error *err;
402 474b4f94 2017-11-30 stsp struct got_tree_entry *te1;
404 a3e2cbea 2017-12-01 stsp te1 = match_entry_by_name(te2, tree1);
405 474b4f94 2017-11-30 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
406 474b4f94 2017-11-30 stsp return NULL;
408 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
409 9c70d4c3 2017-11-30 stsp return diff_added_tree(&te2->id, repo);
410 4e22badc 2017-11-30 stsp return diff_added_blob(&te2->id, repo);
413 474b4f94 2017-11-30 stsp const struct got_error *
414 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
415 474b4f94 2017-11-30 stsp struct got_repository *repo)
417 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
418 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
419 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
422 789689b5 2017-11-30 stsp te1 = SIMPLEQ_FIRST(&tree1->entries);
424 789689b5 2017-11-30 stsp te2 = SIMPLEQ_FIRST(&tree2->entries);
428 6a213ccb 2017-11-30 stsp err = diff_entry_old_new(te1, tree2, repo);
434 4e22badc 2017-11-30 stsp err = diff_entry_new_old(te2, tree1, repo);
440 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
442 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
443 474b4f94 2017-11-30 stsp } while (te1 || te2);
445 474b4f94 2017-11-30 stsp return err;