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 7d283eee 2017-11-29 stsp #include <sha1.h>
24 7d283eee 2017-11-29 stsp #include <zlib.h>
26 7d283eee 2017-11-29 stsp #include "got_repository.h"
27 7d283eee 2017-11-29 stsp #include "got_object.h"
28 7d283eee 2017-11-29 stsp #include "got_error.h"
30 7d283eee 2017-11-29 stsp #include "diff.h"
32 7d283eee 2017-11-29 stsp static const struct got_error *
33 7d283eee 2017-11-29 stsp open_tempfile(FILE **sfp, char **sfn)
35 7d283eee 2017-11-29 stsp static const int sfnlen = 20;
38 ed9e98a8 2017-11-29 stsp *sfn = calloc(sfnlen, sizeof(char));
39 7d283eee 2017-11-29 stsp if (*sfn == NULL)
40 7d283eee 2017-11-29 stsp return got_error(GOT_ERR_NO_MEM);
41 7d283eee 2017-11-29 stsp strlcpy(*sfn, "/tmp/got.XXXXXXXXXX", sfnlen);
42 7d283eee 2017-11-29 stsp if ((fd = mkstemp(*sfn)) == -1 ||
43 7d283eee 2017-11-29 stsp ((*sfp) = fdopen(fd, "w+")) == NULL) {
44 7d283eee 2017-11-29 stsp if (fd != -1) {
45 7d283eee 2017-11-29 stsp unlink(*sfn);
49 7d283eee 2017-11-29 stsp return got_error(GOT_ERR_FILE_OPEN);
51 7d283eee 2017-11-29 stsp return NULL;
54 7d283eee 2017-11-29 stsp const struct got_error *
55 7d283eee 2017-11-29 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
56 474b4f94 2017-11-30 stsp const char *label1, const char *label2, FILE *outfile)
58 ed9e98a8 2017-11-29 stsp struct got_diff_state ds;
59 8ba9a219 2017-11-29 stsp struct got_diff_args args;
60 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
61 7d283eee 2017-11-29 stsp FILE *f1, *f2;
62 7d283eee 2017-11-29 stsp char *n1, *n2;
63 7d283eee 2017-11-29 stsp size_t len, hdrlen;
64 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
65 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
68 7d283eee 2017-11-29 stsp err = open_tempfile(&f1, &n1);
69 7d283eee 2017-11-29 stsp if (err != NULL)
72 7d283eee 2017-11-29 stsp err = open_tempfile(&f2, &n2);
73 7d283eee 2017-11-29 stsp if (err != NULL) {
80 7d283eee 2017-11-29 stsp hdrlen = blob1->hdrlen;
82 7d283eee 2017-11-29 stsp err = got_object_blob_read_block(blob1, &len);
85 7d283eee 2017-11-29 stsp /* Skip blob object header first time around. */
86 7d283eee 2017-11-29 stsp fwrite(blob1->zb.outbuf + hdrlen, len - hdrlen, 1, f1);
88 7d283eee 2017-11-29 stsp } while (len != 0);
90 7d283eee 2017-11-29 stsp hdrlen = blob2->hdrlen;
92 7d283eee 2017-11-29 stsp err = got_object_blob_read_block(blob2, &len);
95 7d283eee 2017-11-29 stsp /* Skip blob object header first time around. */
96 7d283eee 2017-11-29 stsp fwrite(blob2->zb.outbuf + hdrlen, len - hdrlen, 1, f2);
98 7d283eee 2017-11-29 stsp } while (len != 0);
100 7d283eee 2017-11-29 stsp fflush(f1);
101 7d283eee 2017-11-29 stsp fflush(f2);
103 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
104 8ba9a219 2017-11-29 stsp memset(&args, 0, sizeof(args));
106 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
107 62136d3a 2017-11-29 stsp args.label[0] = label1 ?
108 62136d3a 2017-11-29 stsp label1 : got_object_id_str(&blob1->id, hex1, sizeof(hex1));
109 62136d3a 2017-11-29 stsp args.label[1] = label2 ?
110 62136d3a 2017-11-29 stsp label2 : got_object_id_str(&blob2->id, hex2, sizeof(hex2));
112 8ba9a219 2017-11-29 stsp err = got_diffreg(&res, n1, n2, 0, &args, &ds);
114 7d283eee 2017-11-29 stsp unlink(n1);
115 7d283eee 2017-11-29 stsp unlink(n2);
116 7d283eee 2017-11-29 stsp fclose(f1);
117 7d283eee 2017-11-29 stsp fclose(f2);
120 7d283eee 2017-11-29 stsp return err;
123 474b4f94 2017-11-30 stsp static const struct got_error *
124 474b4f94 2017-11-30 stsp match_entry_by_name(struct got_tree_entry **te, struct got_tree_entry *te1,
125 474b4f94 2017-11-30 stsp struct got_tree_object *tree2)
127 474b4f94 2017-11-30 stsp *te = NULL;
128 474b4f94 2017-11-30 stsp return NULL;
132 474b4f94 2017-11-30 stsp same_id(struct got_object_id *id1, struct got_object_id *id2)
134 474b4f94 2017-11-30 stsp return (memcmp(id1->sha1, id2->sha1, SHA1_DIGEST_LENGTH) == 0);
137 474b4f94 2017-11-30 stsp static const struct got_error *
138 474b4f94 2017-11-30 stsp diff_added_blob(struct got_object_id *id)
140 474b4f94 2017-11-30 stsp return NULL;
143 474b4f94 2017-11-30 stsp static const struct got_error *
144 474b4f94 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2)
146 474b4f94 2017-11-30 stsp return NULL;
149 474b4f94 2017-11-30 stsp static const struct got_error *
150 474b4f94 2017-11-30 stsp diff_deleted_blob(struct got_object_id *id)
152 474b4f94 2017-11-30 stsp return NULL;
155 474b4f94 2017-11-30 stsp static const struct got_error *
156 474b4f94 2017-11-30 stsp diff_added_tree(struct got_object_id *id)
158 474b4f94 2017-11-30 stsp return NULL;
161 474b4f94 2017-11-30 stsp static const struct got_error *
162 474b4f94 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2)
164 474b4f94 2017-11-30 stsp return NULL;
167 474b4f94 2017-11-30 stsp static const struct got_error *
168 474b4f94 2017-11-30 stsp diff_deleted_tree(struct got_object_id *id)
170 474b4f94 2017-11-30 stsp return NULL;
173 474b4f94 2017-11-30 stsp static const struct got_error *
174 474b4f94 2017-11-30 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2)
176 474b4f94 2017-11-30 stsp return NULL;
179 474b4f94 2017-11-30 stsp static const struct got_error *
180 474b4f94 2017-11-30 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2)
182 474b4f94 2017-11-30 stsp const struct got_error *err;
183 474b4f94 2017-11-30 stsp struct got_tree_entry *te2;
185 474b4f94 2017-11-30 stsp err = match_entry_by_name(&te2, te1, tree2);
187 474b4f94 2017-11-30 stsp return err;
188 474b4f94 2017-11-30 stsp if (te2 == NULL) {
189 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
190 474b4f94 2017-11-30 stsp return diff_deleted_tree(&te1->id);
191 474b4f94 2017-11-30 stsp return diff_deleted_blob(&te1->id);
194 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode) == S_ISDIR(te2->mode)) {
195 474b4f94 2017-11-30 stsp if (!same_id(&te1->id, &te2->id))
196 474b4f94 2017-11-30 stsp return diff_modified_tree(&te1->id, &te2->id);
197 474b4f94 2017-11-30 stsp } else if (S_ISREG(te1->mode) == S_ISREG(te2->mode)) {
198 474b4f94 2017-11-30 stsp if (!same_id(&te1->id, &te2->id))
199 474b4f94 2017-11-30 stsp return diff_modified_blob(&te1->id, &te2->id);
201 474b4f94 2017-11-30 stsp return diff_kind_mismatch(&te1->id, &te2->id);
203 474b4f94 2017-11-30 stsp return NULL;
206 474b4f94 2017-11-30 stsp static const struct got_error *
207 474b4f94 2017-11-30 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1)
209 474b4f94 2017-11-30 stsp const struct got_error *err;
210 474b4f94 2017-11-30 stsp struct got_tree_entry *te1;
212 474b4f94 2017-11-30 stsp err = match_entry_by_name(&te1, te2, tree1);
214 474b4f94 2017-11-30 stsp return err;
215 474b4f94 2017-11-30 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
216 474b4f94 2017-11-30 stsp return NULL;
218 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
219 474b4f94 2017-11-30 stsp return diff_added_tree(&te2->id);
220 474b4f94 2017-11-30 stsp return diff_added_blob(&te2->id);
223 474b4f94 2017-11-30 stsp const struct got_error *
224 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
225 474b4f94 2017-11-30 stsp struct got_repository *repo)
227 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
228 474b4f94 2017-11-30 stsp struct got_tree_entry *te1;
229 474b4f94 2017-11-30 stsp struct got_tree_entry *te2;
231 474b4f94 2017-11-30 stsp if (tree1->nentries == 0 && tree2->nentries == 0)
232 474b4f94 2017-11-30 stsp return NULL;
234 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_FIRST(&tree1->entries);
235 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_FIRST(&tree2->entries);
239 474b4f94 2017-11-30 stsp err = diff_entry_old_new(te1, tree2);
245 474b4f94 2017-11-30 stsp err = diff_entry_new_old(te2, tree1);
251 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
253 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
254 474b4f94 2017-11-30 stsp } while (te1 || te2);
256 474b4f94 2017-11-30 stsp return err;
