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"
31 7d283eee 2017-11-29 stsp #include "diff.h"
33 f9d67749 2017-11-30 stsp static FILE *
34 f9d67749 2017-11-30 stsp opentemp(void)
36 f9d67749 2017-11-30 stsp char name[PATH_MAX];
40 f9d67749 2017-11-30 stsp if (strlcpy(name, "/tmp/got.XXXXXXXX", sizeof(name)) >= sizeof(name))
41 f9d67749 2017-11-30 stsp return NULL;
43 f9d67749 2017-11-30 stsp fd = mkstemp(name);
45 f9d67749 2017-11-30 stsp return NULL;
47 f9d67749 2017-11-30 stsp unlink(name);
48 a7852263 2017-11-30 stsp f = fdopen(fd, "w+");
49 a7852263 2017-11-30 stsp if (f == NULL) {
51 a7852263 2017-11-30 stsp return NULL;
57 7d283eee 2017-11-29 stsp const struct got_error *
58 7d283eee 2017-11-29 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
59 474b4f94 2017-11-30 stsp const char *label1, const char *label2, FILE *outfile)
61 ed9e98a8 2017-11-29 stsp struct got_diff_state ds;
62 8ba9a219 2017-11-29 stsp struct got_diff_args args;
63 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
64 4e22badc 2017-11-30 stsp FILE *f1 = NULL, *f2 = NULL;
65 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
66 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
67 f9d67749 2017-11-30 stsp size_t len, hdrlen;
68 4e22badc 2017-11-30 stsp int res, flags = 0;
70 4e22badc 2017-11-30 stsp if (blob1) {
71 4e22badc 2017-11-30 stsp f1 = opentemp();
72 4e22badc 2017-11-30 stsp if (f1 == NULL)
73 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
75 4e22badc 2017-11-30 stsp flags |= D_EMPTY1;
77 4e22badc 2017-11-30 stsp if (blob2) {
78 4e22badc 2017-11-30 stsp f2 = opentemp();
79 4e22badc 2017-11-30 stsp if (f2 == NULL) {
81 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
84 4e22badc 2017-11-30 stsp flags |= D_EMPTY2;
86 4e22badc 2017-11-30 stsp if (blob1 == NULL) {
89 4e22badc 2017-11-30 stsp hdrlen = blob1->hdrlen;
91 4e22badc 2017-11-30 stsp err = got_object_blob_read_block(blob1, &len);
94 4e22badc 2017-11-30 stsp /* Skip blob object header first time around. */
95 4e22badc 2017-11-30 stsp fwrite(blob1->zb.outbuf + hdrlen, len - hdrlen, 1, f1);
97 4e22badc 2017-11-30 stsp } while (len != 0);
100 7d283eee 2017-11-29 stsp hdrlen = blob2->hdrlen;
102 7d283eee 2017-11-29 stsp err = got_object_blob_read_block(blob2, &len);
105 7d283eee 2017-11-29 stsp /* Skip blob object header first time around. */
106 7d283eee 2017-11-29 stsp fwrite(blob2->zb.outbuf + hdrlen, len - hdrlen, 1, f2);
107 7d283eee 2017-11-29 stsp hdrlen = 0;
108 7d283eee 2017-11-29 stsp } while (len != 0);
110 7d283eee 2017-11-29 stsp fflush(f1);
111 7d283eee 2017-11-29 stsp fflush(f2);
112 f9d67749 2017-11-30 stsp /* rewind(f1); */
113 f9d67749 2017-11-30 stsp /* rewind(f2);*/
115 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
116 f9d67749 2017-11-30 stsp /* XXX should stat buffers be passed in args instead of ds? */
117 f9d67749 2017-11-30 stsp ds.stb1.st_mode = S_IFREG;
118 f9d67749 2017-11-30 stsp ds.stb1.st_size = blob1->zb.z.total_out;
119 f9d67749 2017-11-30 stsp ds.stb1.st_mtime = 0; /* XXX */
121 f9d67749 2017-11-30 stsp ds.stb2.st_mode = S_IFREG;
122 f9d67749 2017-11-30 stsp ds.stb2.st_size = blob2->zb.z.total_out;
123 f9d67749 2017-11-30 stsp ds.stb2.st_mtime = 0; /* XXX */
125 f9d67749 2017-11-30 stsp memset(&args, 0, sizeof(args));
126 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
127 62136d3a 2017-11-29 stsp args.label[0] = label1 ?
128 62136d3a 2017-11-29 stsp label1 : got_object_id_str(&blob1->id, hex1, sizeof(hex1));
129 62136d3a 2017-11-29 stsp args.label[1] = label2 ?
130 62136d3a 2017-11-29 stsp label2 : got_object_id_str(&blob2->id, hex2, sizeof(hex2));
132 cb74ff21 2017-11-30 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
134 7d283eee 2017-11-29 stsp fclose(f1);
135 7d283eee 2017-11-29 stsp fclose(f2);
136 7d283eee 2017-11-29 stsp return err;
139 474b4f94 2017-11-30 stsp static const struct got_error *
140 474b4f94 2017-11-30 stsp match_entry_by_name(struct got_tree_entry **te, struct got_tree_entry *te1,
141 474b4f94 2017-11-30 stsp struct got_tree_object *tree2)
143 474b4f94 2017-11-30 stsp *te = NULL;
144 474b4f94 2017-11-30 stsp return NULL;
148 474b4f94 2017-11-30 stsp same_id(struct got_object_id *id1, struct got_object_id *id2)
150 474b4f94 2017-11-30 stsp return (memcmp(id1->sha1, id2->sha1, SHA1_DIGEST_LENGTH) == 0);
153 474b4f94 2017-11-30 stsp static const struct got_error *
154 4e22badc 2017-11-30 stsp diff_added_blob(struct got_object_id *id, struct got_repository *repo)
156 4e22badc 2017-11-30 stsp const struct got_error *err;
157 4e22badc 2017-11-30 stsp struct got_blob_object *blob;
158 4e22badc 2017-11-30 stsp struct got_object *obj;
160 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
162 4e22badc 2017-11-30 stsp return err;
163 4e22badc 2017-11-30 stsp err = got_object_blob_open(&blob, repo, obj, 512);
164 4e22badc 2017-11-30 stsp if (err != NULL)
165 4e22badc 2017-11-30 stsp return err;
167 4e22badc 2017-11-30 stsp return got_diff_blob(NULL, blob, NULL, NULL, stdout);
170 474b4f94 2017-11-30 stsp static const struct got_error *
171 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
172 6a213ccb 2017-11-30 stsp struct got_repository *repo)
174 6a213ccb 2017-11-30 stsp const struct got_error *err;
175 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
176 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
177 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
178 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
180 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
182 6a213ccb 2017-11-30 stsp return got_error(GOT_ERR_BAD_OBJ_HDR);
183 6a213ccb 2017-11-30 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
184 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
188 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
190 6a213ccb 2017-11-30 stsp err= got_error(GOT_ERR_BAD_OBJ_HDR);
193 6a213ccb 2017-11-30 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
194 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
198 6a213ccb 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 512);
199 6a213ccb 2017-11-30 stsp if (err != NULL) {
200 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_FILE_OPEN);
204 6a213ccb 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 512);
205 6a213ccb 2017-11-30 stsp if (err != NULL) {
206 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_FILE_OPEN);
210 6a213ccb 2017-11-30 stsp err = got_diff_blob(blob1, blob2, NULL, NULL, stdout);
213 6a213ccb 2017-11-30 stsp got_object_close(obj1);
214 6a213ccb 2017-11-30 stsp got_object_close(obj2);
215 6a213ccb 2017-11-30 stsp got_object_blob_close(blob1);
216 6a213ccb 2017-11-30 stsp got_object_blob_close(blob2);
217 6a213ccb 2017-11-30 stsp return err;
220 474b4f94 2017-11-30 stsp static const struct got_error *
221 365fb436 2017-11-30 stsp diff_deleted_blob(struct got_object_id *id, struct got_repository *repo)
223 365fb436 2017-11-30 stsp const struct got_error *err;
224 365fb436 2017-11-30 stsp struct got_blob_object *blob;
225 365fb436 2017-11-30 stsp struct got_object *obj;
227 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
229 365fb436 2017-11-30 stsp return err;
230 365fb436 2017-11-30 stsp err = got_object_blob_open(&blob, repo, obj, 512);
231 365fb436 2017-11-30 stsp if (err != NULL)
232 365fb436 2017-11-30 stsp return err;
234 365fb436 2017-11-30 stsp return got_diff_blob(blob, NULL, NULL, NULL, stdout);
237 474b4f94 2017-11-30 stsp static const struct got_error *
238 474b4f94 2017-11-30 stsp diff_added_tree(struct got_object_id *id)
240 474b4f94 2017-11-30 stsp return NULL;
243 474b4f94 2017-11-30 stsp static const struct got_error *
244 474b4f94 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2)
246 474b4f94 2017-11-30 stsp return NULL;
249 474b4f94 2017-11-30 stsp static const struct got_error *
250 474b4f94 2017-11-30 stsp diff_deleted_tree(struct got_object_id *id)
252 474b4f94 2017-11-30 stsp return NULL;
255 474b4f94 2017-11-30 stsp static const struct got_error *
256 474b4f94 2017-11-30 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2)
258 474b4f94 2017-11-30 stsp return NULL;
261 474b4f94 2017-11-30 stsp static const struct got_error *
262 6a213ccb 2017-11-30 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
263 6a213ccb 2017-11-30 stsp struct got_repository *repo)
265 474b4f94 2017-11-30 stsp const struct got_error *err;
266 474b4f94 2017-11-30 stsp struct got_tree_entry *te2;
268 474b4f94 2017-11-30 stsp err = match_entry_by_name(&te2, te1, tree2);
270 474b4f94 2017-11-30 stsp return err;
271 474b4f94 2017-11-30 stsp if (te2 == NULL) {
272 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
273 474b4f94 2017-11-30 stsp return diff_deleted_tree(&te1->id);
274 365fb436 2017-11-30 stsp return diff_deleted_blob(&te1->id, repo);
277 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
278 474b4f94 2017-11-30 stsp if (!same_id(&te1->id, &te2->id))
279 474b4f94 2017-11-30 stsp return diff_modified_tree(&te1->id, &te2->id);
280 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
281 474b4f94 2017-11-30 stsp if (!same_id(&te1->id, &te2->id))
282 6a213ccb 2017-11-30 stsp return diff_modified_blob(&te1->id, &te2->id, repo);
285 413ea19d 2017-11-30 stsp return diff_kind_mismatch(&te1->id, &te2->id);
288 474b4f94 2017-11-30 stsp static const struct got_error *
289 4e22badc 2017-11-30 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
290 4e22badc 2017-11-30 stsp struct got_repository *repo)
292 474b4f94 2017-11-30 stsp const struct got_error *err;
293 474b4f94 2017-11-30 stsp struct got_tree_entry *te1;
295 474b4f94 2017-11-30 stsp err = match_entry_by_name(&te1, te2, tree1);
297 474b4f94 2017-11-30 stsp return err;
298 474b4f94 2017-11-30 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
299 474b4f94 2017-11-30 stsp return NULL;
301 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
302 474b4f94 2017-11-30 stsp return diff_added_tree(&te2->id);
303 4e22badc 2017-11-30 stsp return diff_added_blob(&te2->id, repo);
306 474b4f94 2017-11-30 stsp const struct got_error *
307 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
308 474b4f94 2017-11-30 stsp struct got_repository *repo)
310 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
311 474b4f94 2017-11-30 stsp struct got_tree_entry *te1;
312 474b4f94 2017-11-30 stsp struct got_tree_entry *te2;
314 474b4f94 2017-11-30 stsp if (tree1->nentries == 0 && tree2->nentries == 0)
315 474b4f94 2017-11-30 stsp return NULL;
317 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_FIRST(&tree1->entries);
318 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_FIRST(&tree2->entries);
322 6a213ccb 2017-11-30 stsp err = diff_entry_old_new(te1, tree2, repo);
328 4e22badc 2017-11-30 stsp err = diff_entry_new_old(te2, tree1, repo);
334 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
336 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
337 474b4f94 2017-11-30 stsp } while (te1 || te2);
339 474b4f94 2017-11-30 stsp return err;
