2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 d71d75ad 2017-11-05 stsp * Permission to use, copy, modify, and distribute this software for any
5 d71d75ad 2017-11-05 stsp * purpose with or without fee is hereby granted, provided that the above
6 d71d75ad 2017-11-05 stsp * copyright notice and this permission notice appear in all copies.
8 d71d75ad 2017-11-05 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 d71d75ad 2017-11-05 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 d71d75ad 2017-11-05 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 d71d75ad 2017-11-05 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 d71d75ad 2017-11-05 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 d71d75ad 2017-11-05 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 d71d75ad 2017-11-05 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 2178c42e 2018-04-22 stsp #include <sys/types.h>
18 0ffeb3c2 2017-11-26 stsp #include <sys/stat.h>
19 d1cda826 2017-11-06 stsp #include <sys/queue.h>
20 2178c42e 2018-04-22 stsp #include <sys/uio.h>
21 2178c42e 2018-04-22 stsp #include <sys/socket.h>
22 2178c42e 2018-04-22 stsp #include <sys/wait.h>
23 876c234b 2018-09-10 stsp #include <sys/syslimits.h>
25 a1fd68d8 2018-01-12 stsp #include <errno.h>
26 2178c42e 2018-04-22 stsp #include <fcntl.h>
27 d71d75ad 2017-11-05 stsp #include <stdio.h>
28 ab9a70b2 2017-11-06 stsp #include <stdlib.h>
29 ab9a70b2 2017-11-06 stsp #include <string.h>
30 2178c42e 2018-04-22 stsp #include <stdint.h>
31 d71d75ad 2017-11-05 stsp #include <sha1.h>
32 ab9a70b2 2017-11-06 stsp #include <zlib.h>
33 ab9a70b2 2017-11-06 stsp #include <ctype.h>
34 ab9a70b2 2017-11-06 stsp #include <limits.h>
35 2178c42e 2018-04-22 stsp #include <imsg.h>
36 788c352e 2018-06-16 stsp #include <time.h>
38 ab9a70b2 2017-11-06 stsp #include "got_error.h"
39 d71d75ad 2017-11-05 stsp #include "got_object.h"
40 ab9a70b2 2017-11-06 stsp #include "got_repository.h"
41 511a516b 2018-05-19 stsp #include "got_opentemp.h"
43 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
44 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
45 2178c42e 2018-04-22 stsp #include "got_lib_path.h"
46 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
48 2178c42e 2018-04-22 stsp #include "got_lib_privsep.h"
49 6bef87be 2018-09-11 stsp #include "got_lib_object_idcache.h"
50 6bef87be 2018-09-11 stsp #include "got_lib_object_cache.h"
51 ad242220 2018-09-08 stsp #include "got_lib_object_parse.h"
52 15a94983 2018-12-23 stsp #include "got_lib_pack.h"
53 7bb0daa1 2018-06-21 stsp #include "got_lib_repository.h"
56 ab9a70b2 2017-11-06 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
59 8bf5b3c9 2018-03-17 stsp struct got_object_id *
60 8bf5b3c9 2018-03-17 stsp got_object_id_dup(struct got_object_id *id1)
62 8bf5b3c9 2018-03-17 stsp struct got_object_id *id2;
64 8bf5b3c9 2018-03-17 stsp id2 = malloc(sizeof(*id2));
65 8bf5b3c9 2018-03-17 stsp if (id2 == NULL)
66 8bf5b3c9 2018-03-17 stsp return NULL;
67 8bf5b3c9 2018-03-17 stsp memcpy(id2, id1, sizeof(*id2));
71 3235492e 2018-04-01 stsp struct got_object_id *
72 3235492e 2018-04-01 stsp got_object_get_id(struct got_object *obj)
74 6402fb3c 2018-09-15 stsp return &obj->id;
77 bacc9935 2018-05-20 stsp const struct got_error *
78 bacc9935 2018-05-20 stsp got_object_get_id_str(char **outbuf, struct got_object *obj)
80 bacc9935 2018-05-20 stsp return got_object_id_str(outbuf, &obj->id);
83 15a94983 2018-12-23 stsp const struct got_error *
84 15a94983 2018-12-23 stsp got_object_get_type(int *type, struct got_repository *repo,
85 15a94983 2018-12-23 stsp struct got_object_id *id)
87 15a94983 2018-12-23 stsp const struct got_error *err = NULL;
88 15a94983 2018-12-23 stsp struct got_object *obj;
90 15a94983 2018-12-23 stsp err = got_object_open(&obj, repo, id);
94 b107e67f 2018-01-19 stsp switch (obj->type) {
95 a1fd68d8 2018-01-12 stsp case GOT_OBJ_TYPE_COMMIT:
96 a1fd68d8 2018-01-12 stsp case GOT_OBJ_TYPE_TREE:
97 a1fd68d8 2018-01-12 stsp case GOT_OBJ_TYPE_BLOB:
98 b107e67f 2018-01-19 stsp case GOT_OBJ_TYPE_TAG:
99 15a94983 2018-12-23 stsp *type = obj->type;
102 15a94983 2018-12-23 stsp err = got_error(GOT_ERR_OBJ_TYPE);
106 15a94983 2018-12-23 stsp got_object_close(obj);
107 15a94983 2018-12-23 stsp return err;
110 ab9a70b2 2017-11-06 stsp static const struct got_error *
111 4558fcd4 2018-01-14 stsp object_path(char **path, struct got_object_id *id, struct got_repository *repo)
113 ab9a70b2 2017-11-06 stsp const struct got_error *err = NULL;
114 7a132809 2018-07-23 stsp char *hex = NULL;
115 d1cda826 2017-11-06 stsp char *path_objects = got_repo_get_path_objects(repo);
117 e6b1056e 2018-04-22 stsp *path = NULL;
119 ab9a70b2 2017-11-06 stsp if (path_objects == NULL)
120 0a585a0d 2018-03-17 stsp return got_error_from_errno();
122 ef0981d5 2018-02-12 stsp err = got_object_id_str(&hex, id);
126 d1cda826 2017-11-06 stsp if (asprintf(path, "%s/%.2x/%s", path_objects,
127 d1cda826 2017-11-06 stsp id->sha1[0], hex + 2) == -1)
128 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
132 d1cda826 2017-11-06 stsp free(path_objects);
133 d1cda826 2017-11-06 stsp return err;
136 4ee4114f 2018-01-23 stsp static const struct got_error *
137 4796fb13 2018-12-23 stsp open_loose_object(int *fd, struct got_object_id *id,
138 4796fb13 2018-12-23 stsp struct got_repository *repo)
140 d1cda826 2017-11-06 stsp const struct got_error *err = NULL;
141 a1fd68d8 2018-01-12 stsp char *path;
143 4796fb13 2018-12-23 stsp err = object_path(&path, id, repo);
145 d1cda826 2017-11-06 stsp return err;
146 d5003b79 2018-04-22 stsp *fd = open(path, O_RDONLY | O_NOFOLLOW, GOT_DEFAULT_FILE_MODE);
147 d5003b79 2018-04-22 stsp if (*fd == -1) {
148 6c00b545 2018-01-17 stsp err = got_error_from_errno();
152 4558fcd4 2018-01-14 stsp free(path);
153 2090a03d 2018-09-09 stsp return err;
156 2090a03d 2018-09-09 stsp static const struct got_error *
157 2090a03d 2018-09-09 stsp get_packfile_path(char **path_packfile, struct got_packidx *packidx)
159 2090a03d 2018-09-09 stsp size_t size;
161 2090a03d 2018-09-09 stsp /* Packfile path contains ".pack" instead of ".idx", so add one byte. */
162 2090a03d 2018-09-09 stsp size = strlen(packidx->path_packidx) + 2;
163 2090a03d 2018-09-09 stsp if (size < GOT_PACKFILE_NAMELEN + 1)
164 2090a03d 2018-09-09 stsp return got_error(GOT_ERR_BAD_PATH);
166 08451938 2018-11-05 stsp *path_packfile = malloc(size);
167 2090a03d 2018-09-09 stsp if (*path_packfile == NULL)
168 2090a03d 2018-09-09 stsp return got_error_from_errno();
170 2090a03d 2018-09-09 stsp /* Copy up to and excluding ".idx". */
171 2090a03d 2018-09-09 stsp if (strlcpy(*path_packfile, packidx->path_packidx,
172 2090a03d 2018-09-09 stsp size - strlen(GOT_PACKIDX_SUFFIX) - 1) >= size)
173 2090a03d 2018-09-09 stsp return got_error(GOT_ERR_NO_SPACE);
175 2090a03d 2018-09-09 stsp if (strlcat(*path_packfile, GOT_PACKFILE_SUFFIX, size) >= size)
176 2090a03d 2018-09-09 stsp return got_error(GOT_ERR_NO_SPACE);
178 2090a03d 2018-09-09 stsp return NULL;
181 a158c901 2018-12-23 stsp static void
182 a158c901 2018-12-23 stsp exec_privsep_child(int imsg_fds[2], const char *path, const char *repo_path)
184 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[0]) != 0) {
185 3a6ce05a 2019-02-11 stsp fprintf(stderr, "%s: %s\n", getprogname(),
186 3a6ce05a 2019-02-11 stsp strerror(errno));
190 a158c901 2018-12-23 stsp if (dup2(imsg_fds[1], GOT_IMSG_FD_CHILD) == -1) {
191 a158c901 2018-12-23 stsp fprintf(stderr, "%s: %s\n", getprogname(),
192 a158c901 2018-12-23 stsp strerror(errno));
195 a158c901 2018-12-23 stsp if (closefrom(GOT_IMSG_FD_CHILD + 1) == -1) {
196 a158c901 2018-12-23 stsp fprintf(stderr, "%s: %s\n", getprogname(),
197 a158c901 2018-12-23 stsp strerror(errno));
201 a158c901 2018-12-23 stsp if (execl(path, path, repo_path, (char *)NULL) == -1) {
202 a158c901 2018-12-23 stsp fprintf(stderr, "%s: %s: %s\n", getprogname(), path,
203 a158c901 2018-12-23 stsp strerror(errno));
208 2090a03d 2018-09-09 stsp static const struct got_error *
209 a158c901 2018-12-23 stsp request_packed_object(struct got_object **obj, struct got_pack *pack, int idx,
210 a158c901 2018-12-23 stsp struct got_object_id *id)
212 a158c901 2018-12-23 stsp const struct got_error *err = NULL;
213 a158c901 2018-12-23 stsp struct imsgbuf *ibuf = pack->privsep_child->ibuf;
215 a158c901 2018-12-23 stsp err = got_privsep_send_packed_obj_req(ibuf, idx, id);
217 a158c901 2018-12-23 stsp return err;
219 a158c901 2018-12-23 stsp err = got_privsep_recv_obj(obj, ibuf);
221 a158c901 2018-12-23 stsp return err;
223 a158c901 2018-12-23 stsp (*obj)->path_packfile = strdup(pack->path_packfile);
224 a158c901 2018-12-23 stsp if ((*obj)->path_packfile == NULL) {
225 a158c901 2018-12-23 stsp err = got_error_from_errno();
226 a158c901 2018-12-23 stsp return err;
228 a158c901 2018-12-23 stsp memcpy(&(*obj)->id, id, sizeof((*obj)->id));
230 a158c901 2018-12-23 stsp return NULL;
233 a158c901 2018-12-23 stsp static const struct got_error *
234 711fb6e8 2018-12-23 stsp start_pack_privsep_child(struct got_pack *pack, struct got_packidx *packidx)
236 a158c901 2018-12-23 stsp const struct got_error *err = NULL;
237 a158c901 2018-12-23 stsp int imsg_fds[2];
239 a158c901 2018-12-23 stsp struct imsgbuf *ibuf;
241 a158c901 2018-12-23 stsp ibuf = calloc(1, sizeof(*ibuf));
242 a158c901 2018-12-23 stsp if (ibuf == NULL)
243 a158c901 2018-12-23 stsp return got_error_from_errno();
245 a158c901 2018-12-23 stsp pack->privsep_child = calloc(1, sizeof(*pack->privsep_child));
246 a158c901 2018-12-23 stsp if (pack->privsep_child == NULL) {
247 a158c901 2018-12-23 stsp err = got_error_from_errno();
248 a158c901 2018-12-23 stsp free(ibuf);
249 a158c901 2018-12-23 stsp return err;
252 a158c901 2018-12-23 stsp if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
253 a158c901 2018-12-23 stsp err = got_error_from_errno();
257 a158c901 2018-12-23 stsp pid = fork();
258 a158c901 2018-12-23 stsp if (pid == -1) {
259 a158c901 2018-12-23 stsp err = got_error_from_errno();
261 a158c901 2018-12-23 stsp } else if (pid == 0) {
262 a158c901 2018-12-23 stsp exec_privsep_child(imsg_fds, GOT_PATH_PROG_READ_PACK,
263 a158c901 2018-12-23 stsp pack->path_packfile);
264 a158c901 2018-12-23 stsp /* not reached */
267 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[1]) != 0)
268 3a6ce05a 2019-02-11 stsp return got_error_from_errno();
269 a158c901 2018-12-23 stsp pack->privsep_child->imsg_fd = imsg_fds[0];
270 a158c901 2018-12-23 stsp pack->privsep_child->pid = pid;
271 a158c901 2018-12-23 stsp imsg_init(ibuf, imsg_fds[0]);
272 a158c901 2018-12-23 stsp pack->privsep_child->ibuf = ibuf;
274 a158c901 2018-12-23 stsp err = got_privsep_init_pack_child(ibuf, pack, packidx);
276 a158c901 2018-12-23 stsp const struct got_error *child_err;
277 a158c901 2018-12-23 stsp err = got_privsep_send_stop(pack->privsep_child->imsg_fd);
278 a158c901 2018-12-23 stsp child_err = got_privsep_wait_for_child(
279 a158c901 2018-12-23 stsp pack->privsep_child->pid);
280 a158c901 2018-12-23 stsp if (child_err && err == NULL)
281 a158c901 2018-12-23 stsp err = child_err;
285 a158c901 2018-12-23 stsp free(ibuf);
286 a158c901 2018-12-23 stsp free(pack->privsep_child);
287 a158c901 2018-12-23 stsp pack->privsep_child = NULL;
289 a158c901 2018-12-23 stsp return err;
292 711fb6e8 2018-12-23 stsp static const struct got_error *
293 711fb6e8 2018-12-23 stsp read_packed_object_privsep(struct got_object **obj,
294 711fb6e8 2018-12-23 stsp struct got_repository *repo, struct got_pack *pack,
295 711fb6e8 2018-12-23 stsp struct got_packidx *packidx, int idx, struct got_object_id *id)
297 711fb6e8 2018-12-23 stsp const struct got_error *err = NULL;
299 711fb6e8 2018-12-23 stsp if (pack->privsep_child)
300 711fb6e8 2018-12-23 stsp return request_packed_object(obj, pack, idx, id);
302 711fb6e8 2018-12-23 stsp err = start_pack_privsep_child(pack, packidx);
304 711fb6e8 2018-12-23 stsp return err;
306 711fb6e8 2018-12-23 stsp return request_packed_object(obj, pack, idx, id);
310 a158c901 2018-12-23 stsp static const struct got_error *
311 2090a03d 2018-09-09 stsp open_packed_object(struct got_object **obj, struct got_object_id *id,
312 2090a03d 2018-09-09 stsp struct got_repository *repo)
314 2090a03d 2018-09-09 stsp const struct got_error *err = NULL;
315 2090a03d 2018-09-09 stsp struct got_pack *pack = NULL;
316 2090a03d 2018-09-09 stsp struct got_packidx *packidx = NULL;
318 2090a03d 2018-09-09 stsp char *path_packfile;
320 2090a03d 2018-09-09 stsp err = got_repo_search_packidx(&packidx, &idx, repo, id);
322 2090a03d 2018-09-09 stsp return err;
324 2090a03d 2018-09-09 stsp err = get_packfile_path(&path_packfile, packidx);
326 2090a03d 2018-09-09 stsp return err;
328 2090a03d 2018-09-09 stsp pack = got_repo_get_cached_pack(repo, path_packfile);
329 2090a03d 2018-09-09 stsp if (pack == NULL) {
330 2090a03d 2018-09-09 stsp err = got_repo_cache_pack(&pack, repo, path_packfile, packidx);
335 a158c901 2018-12-23 stsp err = read_packed_object_privsep(obj, repo, pack, packidx, idx, id);
339 2090a03d 2018-09-09 stsp err = got_repo_cache_pack(NULL, repo, (*obj)->path_packfile, packidx);
341 2090a03d 2018-09-09 stsp free(path_packfile);
342 4558fcd4 2018-01-14 stsp return err;
345 9f2369b0 2018-12-24 stsp static const struct got_error *
346 9f2369b0 2018-12-24 stsp request_object(struct got_object **obj, struct got_repository *repo, int fd)
348 9f2369b0 2018-12-24 stsp const struct got_error *err = NULL;
349 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
351 9f2369b0 2018-12-24 stsp ibuf = repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].ibuf;
353 aea5f015 2018-12-24 stsp err = got_privsep_send_obj_req(ibuf, fd);
355 9f2369b0 2018-12-24 stsp return err;
357 9f2369b0 2018-12-24 stsp return got_privsep_recv_obj(obj, ibuf);
360 9f2369b0 2018-12-24 stsp static const struct got_error *
361 9f2369b0 2018-12-24 stsp read_object_header_privsep(struct got_object **obj, struct got_repository *repo,
362 9f2369b0 2018-12-24 stsp int obj_fd)
364 9f2369b0 2018-12-24 stsp int imsg_fds[2];
366 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
368 9f2369b0 2018-12-24 stsp if (repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].imsg_fd != -1)
369 9f2369b0 2018-12-24 stsp return request_object(obj, repo, obj_fd);
371 9f2369b0 2018-12-24 stsp ibuf = calloc(1, sizeof(*ibuf));
372 9f2369b0 2018-12-24 stsp if (ibuf == NULL)
373 9f2369b0 2018-12-24 stsp return got_error_from_errno();
375 9f2369b0 2018-12-24 stsp if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
376 9f2369b0 2018-12-24 stsp return got_error_from_errno();
378 9f2369b0 2018-12-24 stsp pid = fork();
379 9f2369b0 2018-12-24 stsp if (pid == -1)
380 9f2369b0 2018-12-24 stsp return got_error_from_errno();
381 9f2369b0 2018-12-24 stsp else if (pid == 0) {
382 9f2369b0 2018-12-24 stsp exec_privsep_child(imsg_fds, GOT_PATH_PROG_READ_OBJECT,
383 9f2369b0 2018-12-24 stsp repo->path);
384 9f2369b0 2018-12-24 stsp /* not reached */
387 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[1]) != 0)
388 3a6ce05a 2019-02-11 stsp return got_error_from_errno();
389 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].imsg_fd =
390 9f2369b0 2018-12-24 stsp imsg_fds[0];
391 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].pid = pid;
392 9f2369b0 2018-12-24 stsp imsg_init(ibuf, imsg_fds[0]);
393 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_OBJECT].ibuf = ibuf;
395 9f2369b0 2018-12-24 stsp return request_object(obj, repo, obj_fd);
399 4558fcd4 2018-01-14 stsp const struct got_error *
400 4558fcd4 2018-01-14 stsp got_object_open(struct got_object **obj, struct got_repository *repo,
401 4558fcd4 2018-01-14 stsp struct got_object_id *id)
403 6c00b545 2018-01-17 stsp const struct got_error *err = NULL;
404 6c00b545 2018-01-17 stsp char *path;
407 7bb0daa1 2018-06-21 stsp *obj = got_repo_get_cached_object(repo, id);
408 7bb0daa1 2018-06-21 stsp if (*obj != NULL) {
409 7bb0daa1 2018-06-21 stsp (*obj)->refcnt++;
410 7bb0daa1 2018-06-21 stsp return NULL;
413 59790a32 2018-09-15 stsp err = open_packed_object(obj, id, repo);
414 59790a32 2018-09-15 stsp if (err && err->code != GOT_ERR_NO_OBJ)
415 59790a32 2018-09-15 stsp return err;
416 59790a32 2018-09-15 stsp if (*obj) {
417 59790a32 2018-09-15 stsp (*obj)->refcnt++;
418 59790a32 2018-09-15 stsp return got_repo_cache_object(repo, id, *obj);
421 6c00b545 2018-01-17 stsp err = object_path(&path, id, repo);
423 4558fcd4 2018-01-14 stsp return err;
425 2178c42e 2018-04-22 stsp fd = open(path, O_RDONLY | O_NOFOLLOW, GOT_DEFAULT_FILE_MODE);
426 2178c42e 2018-04-22 stsp if (fd == -1) {
427 59790a32 2018-09-15 stsp if (errno == ENOENT)
428 91a3d81f 2018-11-11 stsp err = got_error_no_obj(id);
430 6c00b545 2018-01-17 stsp err = got_error_from_errno();
433 9f2369b0 2018-12-24 stsp err = read_object_header_privsep(obj, repo, fd);
436 ab9a70b2 2017-11-06 stsp memcpy((*obj)->id.sha1, id->sha1, SHA1_DIGEST_LENGTH);
439 59790a32 2018-09-15 stsp (*obj)->refcnt++;
440 59790a32 2018-09-15 stsp err = got_repo_cache_object(repo, id, *obj);
442 6c00b545 2018-01-17 stsp free(path);
443 ab9a70b2 2017-11-06 stsp return err;
447 6dfa2fd3 2018-02-12 stsp const struct got_error *
448 6dfa2fd3 2018-02-12 stsp got_object_open_by_id_str(struct got_object **obj, struct got_repository *repo,
449 6dfa2fd3 2018-02-12 stsp const char *id_str)
451 6dfa2fd3 2018-02-12 stsp struct got_object_id id;
453 6dfa2fd3 2018-02-12 stsp if (!got_parse_sha1_digest(id.sha1, id_str))
454 6dfa2fd3 2018-02-12 stsp return got_error(GOT_ERR_BAD_OBJ_ID_STR);
456 6dfa2fd3 2018-02-12 stsp return got_object_open(obj, repo, &id);
459 15a94983 2018-12-23 stsp const struct got_error *
460 15a94983 2018-12-23 stsp got_object_resolve_id_str(struct got_object_id **id,
461 15a94983 2018-12-23 stsp struct got_repository *repo, const char *id_str)
463 15a94983 2018-12-23 stsp const struct got_error *err = NULL;
464 15a94983 2018-12-23 stsp struct got_object *obj;
466 15a94983 2018-12-23 stsp err = got_object_open_by_id_str(&obj, repo, id_str);
468 15a94983 2018-12-23 stsp return err;
470 15a94983 2018-12-23 stsp *id = got_object_id_dup(got_object_get_id(obj));
471 15a94983 2018-12-23 stsp got_object_close(obj);
472 15a94983 2018-12-23 stsp if (*id == NULL)
473 15a94983 2018-12-23 stsp return got_error_from_errno();
475 15a94983 2018-12-23 stsp return NULL;
478 434025f3 2018-09-16 stsp static const struct got_error *
479 a158c901 2018-12-23 stsp request_packed_commit(struct got_commit_object **commit, struct got_pack *pack,
480 a158c901 2018-12-23 stsp int pack_idx, struct got_object_id *id)
482 a158c901 2018-12-23 stsp const struct got_error *err = NULL;
484 a158c901 2018-12-23 stsp err = got_privsep_send_commit_req(pack->privsep_child->ibuf, -1, id,
487 a158c901 2018-12-23 stsp return err;
489 a158c901 2018-12-23 stsp return got_privsep_recv_commit(commit, pack->privsep_child->ibuf);
492 a158c901 2018-12-23 stsp static const struct got_error *
493 a158c901 2018-12-23 stsp read_packed_commit_privsep(struct got_commit_object **commit,
494 a158c901 2018-12-23 stsp struct got_pack *pack, struct got_packidx *packidx, int idx,
495 a158c901 2018-12-23 stsp struct got_object_id *id)
497 a158c901 2018-12-23 stsp const struct got_error *err = NULL;
499 a158c901 2018-12-23 stsp if (pack->privsep_child)
500 a158c901 2018-12-23 stsp return request_packed_commit(commit, pack, idx, id);
502 711fb6e8 2018-12-23 stsp err = start_pack_privsep_child(pack, packidx);
504 a158c901 2018-12-23 stsp return err;
506 711fb6e8 2018-12-23 stsp return request_packed_commit(commit, pack, idx, id);
509 9f2369b0 2018-12-24 stsp static const struct got_error *
510 9f2369b0 2018-12-24 stsp request_commit(struct got_commit_object **commit, struct got_repository *repo,
513 9f2369b0 2018-12-24 stsp const struct got_error *err = NULL;
514 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
516 9f2369b0 2018-12-24 stsp ibuf = repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].ibuf;
518 9f2369b0 2018-12-24 stsp err = got_privsep_send_commit_req(ibuf, fd, NULL, -1);
520 9f2369b0 2018-12-24 stsp return err;
522 9f2369b0 2018-12-24 stsp return got_privsep_recv_commit(commit, ibuf);
525 9f2369b0 2018-12-24 stsp static const struct got_error *
526 9f2369b0 2018-12-24 stsp read_commit_privsep(struct got_commit_object **commit, int obj_fd,
527 9f2369b0 2018-12-24 stsp struct got_repository *repo)
529 9f2369b0 2018-12-24 stsp int imsg_fds[2];
531 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
533 9f2369b0 2018-12-24 stsp if (repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].imsg_fd != -1)
534 9f2369b0 2018-12-24 stsp return request_commit(commit, repo, obj_fd);
536 9f2369b0 2018-12-24 stsp ibuf = calloc(1, sizeof(*ibuf));
537 9f2369b0 2018-12-24 stsp if (ibuf == NULL)
538 9f2369b0 2018-12-24 stsp return got_error_from_errno();
540 9f2369b0 2018-12-24 stsp if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
541 9f2369b0 2018-12-24 stsp return got_error_from_errno();
543 9f2369b0 2018-12-24 stsp pid = fork();
544 9f2369b0 2018-12-24 stsp if (pid == -1)
545 9f2369b0 2018-12-24 stsp return got_error_from_errno();
546 9f2369b0 2018-12-24 stsp else if (pid == 0) {
547 9f2369b0 2018-12-24 stsp exec_privsep_child(imsg_fds, GOT_PATH_PROG_READ_COMMIT,
548 9f2369b0 2018-12-24 stsp repo->path);
549 9f2369b0 2018-12-24 stsp /* not reached */
552 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[1]) != 0)
553 3a6ce05a 2019-02-11 stsp return got_error_from_errno();
554 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].imsg_fd =
555 9f2369b0 2018-12-24 stsp imsg_fds[0];
556 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].pid = pid;
557 9f2369b0 2018-12-24 stsp imsg_init(ibuf, imsg_fds[0]);
558 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_COMMIT].ibuf = ibuf;
560 9f2369b0 2018-12-24 stsp return request_commit(commit, repo, obj_fd);
564 a158c901 2018-12-23 stsp static const struct got_error *
565 434025f3 2018-09-16 stsp open_commit(struct got_commit_object **commit,
566 1785f84a 2018-12-23 stsp struct got_repository *repo, struct got_object_id *id, int check_cache)
568 434025f3 2018-09-16 stsp const struct got_error *err = NULL;
569 1785f84a 2018-12-23 stsp struct got_packidx *packidx = NULL;
571 1785f84a 2018-12-23 stsp char *path_packfile;
573 434025f3 2018-09-16 stsp if (check_cache) {
574 1785f84a 2018-12-23 stsp *commit = got_repo_get_cached_commit(repo, id);
575 434025f3 2018-09-16 stsp if (*commit != NULL) {
576 434025f3 2018-09-16 stsp (*commit)->refcnt++;
577 434025f3 2018-09-16 stsp return NULL;
580 434025f3 2018-09-16 stsp *commit = NULL;
582 1785f84a 2018-12-23 stsp err = got_repo_search_packidx(&packidx, &idx, repo, id);
583 1785f84a 2018-12-23 stsp if (err == NULL) {
584 1785f84a 2018-12-23 stsp struct got_pack *pack = NULL;
586 1785f84a 2018-12-23 stsp err = get_packfile_path(&path_packfile, packidx);
588 1785f84a 2018-12-23 stsp return err;
590 1785f84a 2018-12-23 stsp pack = got_repo_get_cached_pack(repo, path_packfile);
591 434025f3 2018-09-16 stsp if (pack == NULL) {
592 1785f84a 2018-12-23 stsp err = got_repo_cache_pack(&pack, repo, path_packfile,
595 434025f3 2018-09-16 stsp return err;
597 a158c901 2018-12-23 stsp err = read_packed_commit_privsep(commit, pack,
598 1785f84a 2018-12-23 stsp packidx, idx, id);
599 1785f84a 2018-12-23 stsp } else if (err->code == GOT_ERR_NO_OBJ) {
602 1785f84a 2018-12-23 stsp err = open_loose_object(&fd, id, repo);
604 434025f3 2018-09-16 stsp return err;
605 9f2369b0 2018-12-24 stsp err = read_commit_privsep(commit, fd, repo);
608 434025f3 2018-09-16 stsp if (err == NULL) {
609 434025f3 2018-09-16 stsp (*commit)->refcnt++;
610 1785f84a 2018-12-23 stsp err = got_repo_cache_commit(repo, id, *commit);
613 e32baab7 2018-11-05 stsp return err;
616 e32baab7 2018-11-05 stsp const struct got_error *
617 e32baab7 2018-11-05 stsp got_object_open_as_commit(struct got_commit_object **commit,
618 e32baab7 2018-11-05 stsp struct got_repository *repo, struct got_object_id *id)
620 e32baab7 2018-11-05 stsp *commit = got_repo_get_cached_commit(repo, id);
621 e32baab7 2018-11-05 stsp if (*commit != NULL) {
622 e32baab7 2018-11-05 stsp (*commit)->refcnt++;
623 e32baab7 2018-11-05 stsp return NULL;
626 1785f84a 2018-12-23 stsp return open_commit(commit, repo, id, 0);
629 e32baab7 2018-11-05 stsp const struct got_error *
630 e32baab7 2018-11-05 stsp got_object_commit_open(struct got_commit_object **commit,
631 e32baab7 2018-11-05 stsp struct got_repository *repo, struct got_object *obj)
633 1785f84a 2018-12-23 stsp return open_commit(commit, repo, got_object_get_id(obj), 1);
636 434025f3 2018-09-16 stsp const struct got_error *
637 dbc6a6b6 2018-07-12 stsp got_object_qid_alloc(struct got_object_qid **qid, struct got_object_id *id)
639 dbc6a6b6 2018-07-12 stsp const struct got_error *err = NULL;
641 dbc6a6b6 2018-07-12 stsp *qid = calloc(1, sizeof(**qid));
642 dbc6a6b6 2018-07-12 stsp if (*qid == NULL)
643 dbc6a6b6 2018-07-12 stsp return got_error_from_errno();
645 dbc6a6b6 2018-07-12 stsp (*qid)->id = got_object_id_dup(id);
646 dbc6a6b6 2018-07-12 stsp if ((*qid)->id == NULL) {
647 dbc6a6b6 2018-07-12 stsp err = got_error_from_errno();
648 fa2f6902 2018-07-23 stsp got_object_qid_free(*qid);
649 dbc6a6b6 2018-07-12 stsp *qid = NULL;
650 dbc6a6b6 2018-07-12 stsp return err;
653 dbc6a6b6 2018-07-12 stsp return NULL;
656 a158c901 2018-12-23 stsp static const struct got_error *
657 13c729f7 2018-12-24 stsp request_packed_tree(struct got_tree_object **tree, struct got_pack *pack,
658 13c729f7 2018-12-24 stsp int pack_idx, struct got_object_id *id)
660 a158c901 2018-12-23 stsp const struct got_error *err = NULL;
662 13c729f7 2018-12-24 stsp err = got_privsep_send_tree_req(pack->privsep_child->ibuf, -1, id,
665 a158c901 2018-12-23 stsp return err;
667 a158c901 2018-12-23 stsp return got_privsep_recv_tree(tree, pack->privsep_child->ibuf);
670 71eb0e7f 2018-09-16 stsp static const struct got_error *
671 13c729f7 2018-12-24 stsp read_packed_tree_privsep(struct got_tree_object **tree,
672 13c729f7 2018-12-24 stsp struct got_pack *pack, struct got_packidx *packidx, int idx,
673 13c729f7 2018-12-24 stsp struct got_object_id *id)
675 13c729f7 2018-12-24 stsp const struct got_error *err = NULL;
677 13c729f7 2018-12-24 stsp if (pack->privsep_child)
678 13c729f7 2018-12-24 stsp return request_packed_tree(tree, pack, idx, id);
680 13c729f7 2018-12-24 stsp err = start_pack_privsep_child(pack, packidx);
682 13c729f7 2018-12-24 stsp return err;
684 13c729f7 2018-12-24 stsp return request_packed_tree(tree, pack, idx, id);
687 13c729f7 2018-12-24 stsp static const struct got_error *
688 9f2369b0 2018-12-24 stsp request_tree(struct got_tree_object **tree, struct got_repository *repo,
691 9f2369b0 2018-12-24 stsp const struct got_error *err = NULL;
692 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
694 9f2369b0 2018-12-24 stsp ibuf = repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].ibuf;
696 9f2369b0 2018-12-24 stsp err = got_privsep_send_tree_req(ibuf, fd, NULL, -1);
698 9f2369b0 2018-12-24 stsp return err;
700 9f2369b0 2018-12-24 stsp return got_privsep_recv_tree(tree, ibuf);
703 9f2369b0 2018-12-24 stsp const struct got_error *
704 9f2369b0 2018-12-24 stsp read_tree_privsep(struct got_tree_object **tree, int obj_fd,
705 9f2369b0 2018-12-24 stsp struct got_repository *repo)
707 9f2369b0 2018-12-24 stsp int imsg_fds[2];
709 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
711 9f2369b0 2018-12-24 stsp if (repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].imsg_fd != -1)
712 9f2369b0 2018-12-24 stsp return request_tree(tree, repo, obj_fd);
714 9f2369b0 2018-12-24 stsp ibuf = calloc(1, sizeof(*ibuf));
715 9f2369b0 2018-12-24 stsp if (ibuf == NULL)
716 9f2369b0 2018-12-24 stsp return got_error_from_errno();
718 9f2369b0 2018-12-24 stsp if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
719 9f2369b0 2018-12-24 stsp return got_error_from_errno();
721 9f2369b0 2018-12-24 stsp pid = fork();
722 9f2369b0 2018-12-24 stsp if (pid == -1)
723 9f2369b0 2018-12-24 stsp return got_error_from_errno();
724 9f2369b0 2018-12-24 stsp else if (pid == 0) {
725 9f2369b0 2018-12-24 stsp exec_privsep_child(imsg_fds, GOT_PATH_PROG_READ_TREE,
726 9f2369b0 2018-12-24 stsp repo->path);
727 9f2369b0 2018-12-24 stsp /* not reached */
730 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[1]) != 0)
731 3a6ce05a 2019-02-11 stsp return got_error_from_errno();
732 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].imsg_fd =
733 9f2369b0 2018-12-24 stsp imsg_fds[0];
734 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].pid = pid;
735 9f2369b0 2018-12-24 stsp imsg_init(ibuf, imsg_fds[0]);
736 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TREE].ibuf = ibuf;
739 9f2369b0 2018-12-24 stsp return request_tree(tree, repo, obj_fd);
742 9f2369b0 2018-12-24 stsp static const struct got_error *
743 13c729f7 2018-12-24 stsp open_tree(struct got_tree_object **tree, struct got_repository *repo,
744 13c729f7 2018-12-24 stsp struct got_object_id *id, int check_cache)
746 0ffeb3c2 2017-11-26 stsp const struct got_error *err = NULL;
747 13c729f7 2018-12-24 stsp struct got_packidx *packidx = NULL;
749 13c729f7 2018-12-24 stsp char *path_packfile;
751 71eb0e7f 2018-09-16 stsp if (check_cache) {
752 13c729f7 2018-12-24 stsp *tree = got_repo_get_cached_tree(repo, id);
753 71eb0e7f 2018-09-16 stsp if (*tree != NULL) {
754 71eb0e7f 2018-09-16 stsp (*tree)->refcnt++;
755 71eb0e7f 2018-09-16 stsp return NULL;
758 71eb0e7f 2018-09-16 stsp *tree = NULL;
760 13c729f7 2018-12-24 stsp err = got_repo_search_packidx(&packidx, &idx, repo, id);
761 13c729f7 2018-12-24 stsp if (err == NULL) {
762 13c729f7 2018-12-24 stsp struct got_pack *pack = NULL;
764 13c729f7 2018-12-24 stsp err = get_packfile_path(&path_packfile, packidx);
766 13c729f7 2018-12-24 stsp return err;
768 13c729f7 2018-12-24 stsp pack = got_repo_get_cached_pack(repo, path_packfile);
769 e7885405 2018-09-10 stsp if (pack == NULL) {
770 13c729f7 2018-12-24 stsp err = got_repo_cache_pack(&pack, repo, path_packfile,
773 e7885405 2018-09-10 stsp return err;
775 13c729f7 2018-12-24 stsp err = read_packed_tree_privsep(tree, pack,
776 13c729f7 2018-12-24 stsp packidx, idx, id);
777 13c729f7 2018-12-24 stsp } else if (err->code == GOT_ERR_NO_OBJ) {
780 13c729f7 2018-12-24 stsp err = open_loose_object(&fd, id, repo);
782 e0ab43e7 2018-03-16 stsp return err;
783 9f2369b0 2018-12-24 stsp err = read_tree_privsep(tree, fd, repo);
786 f6be5c30 2018-06-22 stsp if (err == NULL) {
787 f6be5c30 2018-06-22 stsp (*tree)->refcnt++;
788 13c729f7 2018-12-24 stsp err = got_repo_cache_tree(repo, id, *tree);
791 776d4d29 2018-06-17 stsp return err;
794 776d4d29 2018-06-17 stsp const struct got_error *
795 776d4d29 2018-06-17 stsp got_object_open_as_tree(struct got_tree_object **tree,
796 776d4d29 2018-06-17 stsp struct got_repository *repo, struct got_object_id *id)
798 e8eb494a 2018-09-16 stsp *tree = got_repo_get_cached_tree(repo, id);
799 e8eb494a 2018-09-16 stsp if (*tree != NULL) {
800 e8eb494a 2018-09-16 stsp (*tree)->refcnt++;
801 e8eb494a 2018-09-16 stsp return NULL;
804 13c729f7 2018-12-24 stsp return open_tree(tree, repo, id, 0);
807 71eb0e7f 2018-09-16 stsp const struct got_error *
808 71eb0e7f 2018-09-16 stsp got_object_tree_open(struct got_tree_object **tree,
809 71eb0e7f 2018-09-16 stsp struct got_repository *repo, struct got_object *obj)
811 13c729f7 2018-12-24 stsp return open_tree(tree, repo, got_object_get_id(obj), 1);
814 883f0469 2018-06-23 stsp const struct got_tree_entries *
815 883f0469 2018-06-23 stsp got_object_tree_get_entries(struct got_tree_object *tree)
817 883f0469 2018-06-23 stsp return &tree->entries;
820 3840f4c9 2018-09-12 stsp static const struct got_error *
821 ac544f8c 2019-01-13 stsp request_packed_blob(uint8_t **outbuf, size_t *size, size_t *hdrlen, int outfd,
822 ebc55e2d 2018-12-24 stsp struct got_pack *pack, struct got_packidx *packidx, int idx,
823 ebc55e2d 2018-12-24 stsp struct got_object_id *id)
825 3840f4c9 2018-09-12 stsp const struct got_error *err = NULL;
826 3840f4c9 2018-09-12 stsp int outfd_child;
827 3840f4c9 2018-09-12 stsp int basefd, accumfd; /* temporary files for delta application */
829 3840f4c9 2018-09-12 stsp basefd = got_opentempfd();
830 3840f4c9 2018-09-12 stsp if (basefd == -1)
831 3840f4c9 2018-09-12 stsp return got_error_from_errno();
832 3840f4c9 2018-09-12 stsp accumfd = got_opentempfd();
833 3840f4c9 2018-09-12 stsp if (accumfd == -1)
834 3840f4c9 2018-09-12 stsp return got_error_from_errno();
836 3840f4c9 2018-09-12 stsp outfd_child = dup(outfd);
837 3840f4c9 2018-09-12 stsp if (outfd_child == -1)
838 3840f4c9 2018-09-12 stsp return got_error_from_errno();
840 ebc55e2d 2018-12-24 stsp err = got_privsep_send_blob_req(pack->privsep_child->ibuf, -1, id, idx);
842 3840f4c9 2018-09-12 stsp return err;
844 3840f4c9 2018-09-12 stsp err = got_privsep_send_blob_outfd(pack->privsep_child->ibuf,
845 3840f4c9 2018-09-12 stsp outfd_child);
847 41496140 2019-02-21 stsp close(basefd);
848 41496140 2019-02-21 stsp close(accumfd);
849 3840f4c9 2018-09-12 stsp return err;
852 3840f4c9 2018-09-12 stsp err = got_privsep_send_tmpfd(pack->privsep_child->ibuf,
855 3840f4c9 2018-09-12 stsp close(accumfd);
856 3840f4c9 2018-09-12 stsp return err;
859 3840f4c9 2018-09-12 stsp err = got_privsep_send_tmpfd(pack->privsep_child->ibuf,
862 3840f4c9 2018-09-12 stsp return err;
864 ac544f8c 2019-01-13 stsp err = got_privsep_recv_blob(outbuf, size, hdrlen,
865 ebc55e2d 2018-12-24 stsp pack->privsep_child->ibuf);
867 3840f4c9 2018-09-12 stsp return err;
869 3840f4c9 2018-09-12 stsp if (lseek(outfd, SEEK_SET, 0) == -1)
870 3840f4c9 2018-09-12 stsp err = got_error_from_errno();
872 3840f4c9 2018-09-12 stsp return err;
875 ebc55e2d 2018-12-24 stsp static const struct got_error *
876 ac544f8c 2019-01-13 stsp read_packed_blob_privsep(uint8_t **outbuf, size_t *size, size_t *hdrlen,
877 ac544f8c 2019-01-13 stsp int outfd, struct got_pack *pack, struct got_packidx *packidx, int idx,
878 ebc55e2d 2018-12-24 stsp struct got_object_id *id)
880 68482ea3 2017-11-27 stsp const struct got_error *err = NULL;
882 ebc55e2d 2018-12-24 stsp if (pack->privsep_child == NULL) {
883 ebc55e2d 2018-12-24 stsp err = start_pack_privsep_child(pack, packidx);
885 ebc55e2d 2018-12-24 stsp return err;
888 ac544f8c 2019-01-13 stsp return request_packed_blob(outbuf, size, hdrlen, outfd, pack, packidx,
892 9f2369b0 2018-12-24 stsp static const struct got_error *
893 ac544f8c 2019-01-13 stsp request_blob(uint8_t **outbuf, size_t *size, size_t *hdrlen, int outfd,
894 ac544f8c 2019-01-13 stsp int infd, struct imsgbuf *ibuf)
896 9f2369b0 2018-12-24 stsp const struct got_error *err = NULL;
897 9f2369b0 2018-12-24 stsp int outfd_child;
899 9f2369b0 2018-12-24 stsp outfd_child = dup(outfd);
900 9f2369b0 2018-12-24 stsp if (outfd_child == -1)
901 9f2369b0 2018-12-24 stsp return got_error_from_errno();
903 9f2369b0 2018-12-24 stsp err = got_privsep_send_blob_req(ibuf, infd, NULL, -1);
905 9f2369b0 2018-12-24 stsp return err;
907 9f2369b0 2018-12-24 stsp err = got_privsep_send_blob_outfd(ibuf, outfd_child);
909 9f2369b0 2018-12-24 stsp return err;
911 ac544f8c 2019-01-13 stsp err = got_privsep_recv_blob(outbuf, size, hdrlen, ibuf);
913 9f2369b0 2018-12-24 stsp return err;
915 9f2369b0 2018-12-24 stsp if (lseek(outfd, SEEK_SET, 0) == -1)
916 9f2369b0 2018-12-24 stsp return got_error_from_errno();
918 9f2369b0 2018-12-24 stsp return err;
921 9f2369b0 2018-12-24 stsp static const struct got_error *
922 ac544f8c 2019-01-13 stsp read_blob_privsep(uint8_t **outbuf, size_t *size, size_t *hdrlen,
923 9f2369b0 2018-12-24 stsp int outfd, int infd, struct got_repository *repo)
925 9f2369b0 2018-12-24 stsp int imsg_fds[2];
927 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
929 9f2369b0 2018-12-24 stsp if (repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].imsg_fd != -1) {
930 9f2369b0 2018-12-24 stsp ibuf = repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].ibuf;
931 ac544f8c 2019-01-13 stsp return request_blob(outbuf, size, hdrlen, outfd, infd, ibuf);
934 9f2369b0 2018-12-24 stsp ibuf = calloc(1, sizeof(*ibuf));
935 9f2369b0 2018-12-24 stsp if (ibuf == NULL)
936 9f2369b0 2018-12-24 stsp return got_error_from_errno();
938 9f2369b0 2018-12-24 stsp if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
939 9f2369b0 2018-12-24 stsp return got_error_from_errno();
941 9f2369b0 2018-12-24 stsp pid = fork();
942 9f2369b0 2018-12-24 stsp if (pid == -1)
943 9f2369b0 2018-12-24 stsp return got_error_from_errno();
944 9f2369b0 2018-12-24 stsp else if (pid == 0) {
945 9f2369b0 2018-12-24 stsp exec_privsep_child(imsg_fds, GOT_PATH_PROG_READ_BLOB,
946 9f2369b0 2018-12-24 stsp repo->path);
947 9f2369b0 2018-12-24 stsp /* not reached */
950 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[1]) != 0)
951 3a6ce05a 2019-02-11 stsp return got_error_from_errno();
952 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].imsg_fd =
953 9f2369b0 2018-12-24 stsp imsg_fds[0];
954 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].pid = pid;
955 9f2369b0 2018-12-24 stsp imsg_init(ibuf, imsg_fds[0]);
956 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_BLOB].ibuf = ibuf;
958 ac544f8c 2019-01-13 stsp return request_blob(outbuf, size, hdrlen, outfd, infd, ibuf);
961 ebc55e2d 2018-12-24 stsp static const struct got_error *
962 ebc55e2d 2018-12-24 stsp open_blob(struct got_blob_object **blob, struct got_repository *repo,
963 ebc55e2d 2018-12-24 stsp struct got_object_id *id, size_t blocksize)
965 ebc55e2d 2018-12-24 stsp const struct got_error *err = NULL;
966 ebc55e2d 2018-12-24 stsp struct got_packidx *packidx = NULL;
968 ebc55e2d 2018-12-24 stsp char *path_packfile;
969 ac544f8c 2019-01-13 stsp uint8_t *outbuf;
971 ebc55e2d 2018-12-24 stsp size_t size, hdrlen;
972 ebc55e2d 2018-12-24 stsp struct stat sb;
974 68482ea3 2017-11-27 stsp *blob = calloc(1, sizeof(**blob));
975 4558fcd4 2018-01-14 stsp if (*blob == NULL)
976 0a585a0d 2018-03-17 stsp return got_error_from_errno();
978 55da3778 2018-09-10 stsp outfd = got_opentempfd();
979 55da3778 2018-09-10 stsp if (outfd == -1)
980 55da3778 2018-09-10 stsp return got_error_from_errno();
982 062ebb78 2018-07-12 stsp (*blob)->read_buf = malloc(blocksize);
983 15c8b0e6 2018-04-24 stsp if ((*blob)->read_buf == NULL) {
984 15c8b0e6 2018-04-24 stsp err = got_error_from_errno();
988 ebc55e2d 2018-12-24 stsp err = got_repo_search_packidx(&packidx, &idx, repo, id);
989 ebc55e2d 2018-12-24 stsp if (err == NULL) {
990 ebc55e2d 2018-12-24 stsp struct got_pack *pack = NULL;
992 ebc55e2d 2018-12-24 stsp err = get_packfile_path(&path_packfile, packidx);
996 ebc55e2d 2018-12-24 stsp pack = got_repo_get_cached_pack(repo, path_packfile);
997 55da3778 2018-09-10 stsp if (pack == NULL) {
998 ebc55e2d 2018-12-24 stsp err = got_repo_cache_pack(&pack, repo, path_packfile,
1001 55da3778 2018-09-10 stsp goto done;
1003 ac544f8c 2019-01-13 stsp err = read_packed_blob_privsep(&outbuf, &size, &hdrlen, outfd,
1004 ac544f8c 2019-01-13 stsp pack, packidx, idx, id);
1005 ebc55e2d 2018-12-24 stsp } else if (err->code == GOT_ERR_NO_OBJ) {
1008 ebc55e2d 2018-12-24 stsp err = open_loose_object(&infd, id, repo);
1010 c7254d79 2018-04-24 stsp goto done;
1011 ac544f8c 2019-01-13 stsp err = read_blob_privsep(&outbuf, &size, &hdrlen, outfd, infd,
1015 55da3778 2018-09-10 stsp goto done;
1017 de060dff 2018-12-24 stsp if (hdrlen > size) {
1018 ebc55e2d 2018-12-24 stsp err = got_error(GOT_ERR_BAD_OBJ_HDR);
1019 ebc55e2d 2018-12-24 stsp goto done;
1022 ac544f8c 2019-01-13 stsp if (outbuf) {
1023 3a6ce05a 2019-02-11 stsp if (close(outfd) != 0 && err == NULL)
1024 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
1025 ac544f8c 2019-01-13 stsp outfd = -1;
1026 ac544f8c 2019-01-13 stsp (*blob)->f = fmemopen(outbuf, size, "rb");
1027 ac544f8c 2019-01-13 stsp if ((*blob)->f == NULL) {
1028 ac544f8c 2019-01-13 stsp err = got_error_from_errno();
1029 ac544f8c 2019-01-13 stsp free(outbuf);
1030 ac544f8c 2019-01-13 stsp goto done;
1032 ac544f8c 2019-01-13 stsp (*blob)->data = outbuf;
1034 ac544f8c 2019-01-13 stsp if (fstat(outfd, &sb) == -1) {
1035 ac544f8c 2019-01-13 stsp err = got_error_from_errno();
1036 ac544f8c 2019-01-13 stsp goto done;
1039 ac544f8c 2019-01-13 stsp if (sb.st_size != size) {
1040 ac544f8c 2019-01-13 stsp err = got_error(GOT_ERR_PRIVSEP_LEN);
1041 ac544f8c 2019-01-13 stsp goto done;
1044 ac544f8c 2019-01-13 stsp (*blob)->f = fdopen(outfd, "rb");
1045 ac544f8c 2019-01-13 stsp if ((*blob)->f == NULL) {
1046 ac544f8c 2019-01-13 stsp err = got_error_from_errno();
1047 ac544f8c 2019-01-13 stsp close(outfd);
1048 ac544f8c 2019-01-13 stsp outfd = -1;
1049 ac544f8c 2019-01-13 stsp goto done;
1053 ebc55e2d 2018-12-24 stsp (*blob)->hdrlen = hdrlen;
1054 eb651edf 2018-02-11 stsp (*blob)->blocksize = blocksize;
1055 ebc55e2d 2018-12-24 stsp memcpy(&(*blob)->id.sha1, id->sha1, SHA1_DIGEST_LENGTH);
1058 55da3778 2018-09-10 stsp if (err) {
1059 55da3778 2018-09-10 stsp if (*blob) {
1060 7baf5860 2019-03-19 stsp got_object_blob_close(*blob);
1061 55da3778 2018-09-10 stsp *blob = NULL;
1062 55da3778 2018-09-10 stsp } else if (outfd != -1)
1063 55da3778 2018-09-10 stsp close(outfd);
1065 a19581a2 2018-06-21 stsp return err;
1068 a19581a2 2018-06-21 stsp const struct got_error *
1069 a19581a2 2018-06-21 stsp got_object_open_as_blob(struct got_blob_object **blob,
1070 a19581a2 2018-06-21 stsp struct got_repository *repo, struct got_object_id *id,
1071 a19581a2 2018-06-21 stsp size_t blocksize)
1073 ebc55e2d 2018-12-24 stsp return open_blob(blob, repo, id, blocksize);
1076 ebc55e2d 2018-12-24 stsp const struct got_error *
1077 ebc55e2d 2018-12-24 stsp got_object_blob_open(struct got_blob_object **blob,
1078 ebc55e2d 2018-12-24 stsp struct got_repository *repo, struct got_object *obj, size_t blocksize)
1080 ebc55e2d 2018-12-24 stsp return open_blob(blob, repo, got_object_get_id(obj), blocksize);
1083 fb43ecf1 2019-02-11 stsp const struct got_error *
1084 68482ea3 2017-11-27 stsp got_object_blob_close(struct got_blob_object *blob)
1086 fb43ecf1 2019-02-11 stsp const struct got_error *err = NULL;
1087 15c8b0e6 2018-04-24 stsp free(blob->read_buf);
1088 7baf5860 2019-03-19 stsp if (blob->f && fclose(blob->f) != 0)
1089 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
1090 ac544f8c 2019-01-13 stsp free(blob->data);
1091 68482ea3 2017-11-27 stsp free(blob);
1092 fb43ecf1 2019-02-11 stsp return err;
1096 f934cf2c 2018-02-12 stsp got_object_blob_id_str(struct got_blob_object *blob, char *buf, size_t size)
1098 f934cf2c 2018-02-12 stsp return got_sha1_digest_to_str(blob->id.sha1, buf, size);
1102 f934cf2c 2018-02-12 stsp got_object_blob_get_hdrlen(struct got_blob_object *blob)
1104 f934cf2c 2018-02-12 stsp return blob->hdrlen;
1107 f934cf2c 2018-02-12 stsp const uint8_t *
1108 f934cf2c 2018-02-12 stsp got_object_blob_get_read_buf(struct got_blob_object *blob)
1110 f934cf2c 2018-02-12 stsp return blob->read_buf;
1113 68482ea3 2017-11-27 stsp const struct got_error *
1114 eb651edf 2018-02-11 stsp got_object_blob_read_block(size_t *outlenp, struct got_blob_object *blob)
1118 eb651edf 2018-02-11 stsp n = fread(blob->read_buf, 1, blob->blocksize, blob->f);
1119 eb651edf 2018-02-11 stsp if (n == 0 && ferror(blob->f))
1120 eb651edf 2018-02-11 stsp return got_ferror(blob->f, GOT_ERR_IO);
1121 eb651edf 2018-02-11 stsp *outlenp = n;
1122 35e9ba5d 2018-06-21 stsp return NULL;
1125 35e9ba5d 2018-06-21 stsp const struct got_error *
1126 6fcac457 2018-11-19 stsp got_object_blob_dump_to_file(size_t *total_len, int *nlines,
1127 84451b3e 2018-07-10 stsp FILE *outfile, struct got_blob_object *blob)
1129 35e9ba5d 2018-06-21 stsp const struct got_error *err = NULL;
1130 b6752625 2018-12-24 stsp size_t n, len, hdrlen;
1131 84451b3e 2018-07-10 stsp const uint8_t *buf;
1134 84451b3e 2018-07-10 stsp if (total_len)
1135 84451b3e 2018-07-10 stsp *total_len = 0;
1136 84451b3e 2018-07-10 stsp if (nlines)
1137 84451b3e 2018-07-10 stsp *nlines = 0;
1139 35e9ba5d 2018-06-21 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1141 35e9ba5d 2018-06-21 stsp err = got_object_blob_read_block(&len, blob);
1143 35e9ba5d 2018-06-21 stsp return err;
1144 35e9ba5d 2018-06-21 stsp if (len == 0)
1146 84451b3e 2018-07-10 stsp if (total_len)
1147 84451b3e 2018-07-10 stsp *total_len += len;
1148 84451b3e 2018-07-10 stsp buf = got_object_blob_get_read_buf(blob);
1149 84451b3e 2018-07-10 stsp if (nlines) {
1150 84451b3e 2018-07-10 stsp for (i = 0; i < len; i++) {
1151 84451b3e 2018-07-10 stsp if (buf[i] == '\n')
1152 84451b3e 2018-07-10 stsp (*nlines)++;
1155 35e9ba5d 2018-06-21 stsp /* Skip blob object header first time around. */
1156 454a6b59 2018-12-24 stsp n = fwrite(buf + hdrlen, 1, len - hdrlen, outfile);
1157 b6752625 2018-12-24 stsp if (n != len - hdrlen)
1158 b6752625 2018-12-24 stsp return got_ferror(outfile, GOT_ERR_IO);
1159 35e9ba5d 2018-06-21 stsp hdrlen = 0;
1160 35e9ba5d 2018-06-21 stsp } while (len != 0);
1162 cbe7f848 2019-02-11 stsp if (fflush(outfile) != 0)
1163 cbe7f848 2019-02-11 stsp return got_error_from_errno();
1164 35e9ba5d 2018-06-21 stsp rewind(outfile);
1166 776d4d29 2018-06-17 stsp return NULL;
1169 f4a881ce 2018-11-17 stsp static const struct got_error *
1170 268f7291 2018-12-24 stsp request_packed_tag(struct got_tag_object **tag, struct got_pack *pack,
1171 268f7291 2018-12-24 stsp int pack_idx, struct got_object_id *id)
1173 a158c901 2018-12-23 stsp const struct got_error *err = NULL;
1175 268f7291 2018-12-24 stsp err = got_privsep_send_tag_req(pack->privsep_child->ibuf, -1, id,
1176 268f7291 2018-12-24 stsp pack_idx);
1178 a158c901 2018-12-23 stsp return err;
1180 a158c901 2018-12-23 stsp return got_privsep_recv_tag(tag, pack->privsep_child->ibuf);
1183 268f7291 2018-12-24 stsp static const struct got_error *
1184 268f7291 2018-12-24 stsp read_packed_tag_privsep(struct got_tag_object **tag,
1185 268f7291 2018-12-24 stsp struct got_pack *pack, struct got_packidx *packidx, int idx,
1186 268f7291 2018-12-24 stsp struct got_object_id *id)
1188 268f7291 2018-12-24 stsp const struct got_error *err = NULL;
1190 268f7291 2018-12-24 stsp if (pack->privsep_child)
1191 268f7291 2018-12-24 stsp return request_packed_tag(tag, pack, idx, id);
1193 268f7291 2018-12-24 stsp err = start_pack_privsep_child(pack, packidx);
1195 268f7291 2018-12-24 stsp return err;
1197 268f7291 2018-12-24 stsp return request_packed_tag(tag, pack, idx, id);
1200 9f2369b0 2018-12-24 stsp static const struct got_error *
1201 9f2369b0 2018-12-24 stsp request_tag(struct got_tag_object **tag, struct got_repository *repo,
1204 9f2369b0 2018-12-24 stsp const struct got_error *err = NULL;
1205 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
1207 9f2369b0 2018-12-24 stsp ibuf = repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].ibuf;
1209 9f2369b0 2018-12-24 stsp err = got_privsep_send_tag_req(ibuf, fd, NULL, -1);
1211 9f2369b0 2018-12-24 stsp return err;
1213 9f2369b0 2018-12-24 stsp return got_privsep_recv_tag(tag, ibuf);
1216 9f2369b0 2018-12-24 stsp static const struct got_error *
1217 9f2369b0 2018-12-24 stsp read_tag_privsep(struct got_tag_object **tag, int obj_fd,
1218 9f2369b0 2018-12-24 stsp struct got_repository *repo)
1220 9f2369b0 2018-12-24 stsp int imsg_fds[2];
1221 9f2369b0 2018-12-24 stsp pid_t pid;
1222 9f2369b0 2018-12-24 stsp struct imsgbuf *ibuf;
1224 9f2369b0 2018-12-24 stsp if (repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].imsg_fd != -1)
1225 9f2369b0 2018-12-24 stsp return request_tag(tag, repo, obj_fd);
1227 9f2369b0 2018-12-24 stsp ibuf = calloc(1, sizeof(*ibuf));
1228 9f2369b0 2018-12-24 stsp if (ibuf == NULL)
1229 9f2369b0 2018-12-24 stsp return got_error_from_errno();
1231 9f2369b0 2018-12-24 stsp if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1)
1232 9f2369b0 2018-12-24 stsp return got_error_from_errno();
1234 9f2369b0 2018-12-24 stsp pid = fork();
1235 9f2369b0 2018-12-24 stsp if (pid == -1)
1236 9f2369b0 2018-12-24 stsp return got_error_from_errno();
1237 9f2369b0 2018-12-24 stsp else if (pid == 0) {
1238 9f2369b0 2018-12-24 stsp exec_privsep_child(imsg_fds, GOT_PATH_PROG_READ_TAG,
1239 9f2369b0 2018-12-24 stsp repo->path);
1240 9f2369b0 2018-12-24 stsp /* not reached */
1243 3a6ce05a 2019-02-11 stsp if (close(imsg_fds[1]) != 0)
1244 3a6ce05a 2019-02-11 stsp return got_error_from_errno();
1245 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].imsg_fd =
1246 9f2369b0 2018-12-24 stsp imsg_fds[0];
1247 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].pid = pid;
1248 9f2369b0 2018-12-24 stsp imsg_init(ibuf, imsg_fds[0]);
1249 9f2369b0 2018-12-24 stsp repo->privsep_children[GOT_REPO_PRIVSEP_CHILD_TAG].ibuf = ibuf;
1251 9f2369b0 2018-12-24 stsp return request_tag(tag, repo, obj_fd);
1254 a158c901 2018-12-23 stsp static const struct got_error *
1255 268f7291 2018-12-24 stsp open_tag(struct got_tag_object **tag, struct got_repository *repo,
1256 268f7291 2018-12-24 stsp struct got_object_id *id, int check_cache)
1258 f4a881ce 2018-11-17 stsp const struct got_error *err = NULL;
1259 268f7291 2018-12-24 stsp struct got_packidx *packidx = NULL;
1261 268f7291 2018-12-24 stsp char *path_packfile;
1263 f4a881ce 2018-11-17 stsp if (check_cache) {
1264 268f7291 2018-12-24 stsp *tag = got_repo_get_cached_tag(repo, id);
1265 f4a881ce 2018-11-17 stsp if (*tag != NULL) {
1266 f4a881ce 2018-11-17 stsp (*tag)->refcnt++;
1267 f4a881ce 2018-11-17 stsp return NULL;
1270 f4a881ce 2018-11-17 stsp *tag = NULL;
1272 268f7291 2018-12-24 stsp err = got_repo_search_packidx(&packidx, &idx, repo, id);
1273 268f7291 2018-12-24 stsp if (err == NULL) {
1274 268f7291 2018-12-24 stsp struct got_pack *pack = NULL;
1276 268f7291 2018-12-24 stsp err = get_packfile_path(&path_packfile, packidx);
1278 268f7291 2018-12-24 stsp return err;
1280 268f7291 2018-12-24 stsp pack = got_repo_get_cached_pack(repo, path_packfile);
1281 f4a881ce 2018-11-17 stsp if (pack == NULL) {
1282 268f7291 2018-12-24 stsp err = got_repo_cache_pack(&pack, repo, path_packfile,
1285 f4a881ce 2018-11-17 stsp return err;
1287 268f7291 2018-12-24 stsp err = read_packed_tag_privsep(tag, pack,
1288 268f7291 2018-12-24 stsp packidx, idx, id);
1289 268f7291 2018-12-24 stsp } else if (err->code == GOT_ERR_NO_OBJ) {
1292 268f7291 2018-12-24 stsp err = open_loose_object(&fd, id, repo);
1294 f4a881ce 2018-11-17 stsp return err;
1295 9f2369b0 2018-12-24 stsp err = read_tag_privsep(tag, fd, repo);
1298 f4a881ce 2018-11-17 stsp if (err == NULL) {
1299 f4a881ce 2018-11-17 stsp (*tag)->refcnt++;
1300 268f7291 2018-12-24 stsp err = got_repo_cache_tag(repo, id, *tag);
1303 f4a881ce 2018-11-17 stsp return err;
1306 f4a881ce 2018-11-17 stsp const struct got_error *
1307 f4a881ce 2018-11-17 stsp got_object_open_as_tag(struct got_tag_object **tag,
1308 f4a881ce 2018-11-17 stsp struct got_repository *repo, struct got_object_id *id)
1310 f4a881ce 2018-11-17 stsp *tag = got_repo_get_cached_tag(repo, id);
1311 f4a881ce 2018-11-17 stsp if (*tag != NULL) {
1312 f4a881ce 2018-11-17 stsp (*tag)->refcnt++;
1313 f4a881ce 2018-11-17 stsp return NULL;
1316 268f7291 2018-12-24 stsp return open_tag(tag, repo, id, 0);
1319 f4a881ce 2018-11-17 stsp const struct got_error *
1320 f4a881ce 2018-11-17 stsp got_object_tag_open(struct got_tag_object **tag,
1321 f4a881ce 2018-11-17 stsp struct got_repository *repo, struct got_object *obj)
1323 268f7291 2018-12-24 stsp return open_tag(tag, repo, got_object_get_id(obj), 1);
1327 0bd18d37 2019-02-01 stsp got_object_tag_get_object_type(struct got_tag_object *tag)
1329 0bd18d37 2019-02-01 stsp return tag->obj_type;
1332 0bd18d37 2019-02-01 stsp struct got_object_id *
1333 0bd18d37 2019-02-01 stsp got_object_tag_get_object_id(struct got_tag_object *tag)
1335 0bd18d37 2019-02-01 stsp return &tag->id;
1338 776d4d29 2018-06-17 stsp static struct got_tree_entry *
1339 65a9bbe9 2018-09-15 stsp find_entry_by_name(struct got_tree_object *tree, const char *name, size_t len)
1341 776d4d29 2018-06-17 stsp struct got_tree_entry *te;
1343 63da309a 2018-11-07 stsp /* Note that tree entries are sorted in strncmp() order. */
1344 883f0469 2018-06-23 stsp SIMPLEQ_FOREACH(te, &tree->entries.head, entry) {
1345 63da309a 2018-11-07 stsp int cmp = strncmp(te->name, name, len);
1346 63da309a 2018-11-07 stsp if (cmp < 0)
1348 63da309a 2018-11-07 stsp if (cmp > 0)
1350 63da309a 2018-11-07 stsp if (te->name[len] == '\0')
1351 776d4d29 2018-06-17 stsp return te;
1353 eb651edf 2018-02-11 stsp return NULL;
1356 a129376b 2019-03-28 stsp const struct got_tree_entry *
1357 a129376b 2019-03-28 stsp got_object_tree_find_entry(struct got_tree_object *tree, const char *name)
1359 a129376b 2019-03-28 stsp return find_entry_by_name(tree, name, strlen(name));
1362 776d4d29 2018-06-17 stsp const struct got_error *
1363 27d434c2 2018-09-15 stsp got_object_id_by_path(struct got_object_id **id, struct got_repository *repo,
1364 776d4d29 2018-06-17 stsp struct got_object_id *commit_id, const char *path)
1366 776d4d29 2018-06-17 stsp const struct got_error *err = NULL;
1367 776d4d29 2018-06-17 stsp struct got_commit_object *commit = NULL;
1368 776d4d29 2018-06-17 stsp struct got_tree_object *tree = NULL;
1369 db37e2c0 2018-06-21 stsp struct got_tree_entry *te = NULL;
1370 65a9bbe9 2018-09-15 stsp const char *seg, *s;
1371 b7cd37e5 2018-11-18 stsp size_t seglen;
1373 27d434c2 2018-09-15 stsp *id = NULL;
1375 776d4d29 2018-06-17 stsp /* We are expecting an absolute in-repository path. */
1376 776d4d29 2018-06-17 stsp if (path[0] != '/')
1377 776d4d29 2018-06-17 stsp return got_error(GOT_ERR_NOT_ABSPATH);
1379 776d4d29 2018-06-17 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
1381 776d4d29 2018-06-17 stsp goto done;
1383 776d4d29 2018-06-17 stsp /* Handle opening of root of commit's tree. */
1384 776d4d29 2018-06-17 stsp if (path[1] == '\0') {
1385 27d434c2 2018-09-15 stsp *id = got_object_id_dup(commit->tree_id);
1386 27d434c2 2018-09-15 stsp if (*id == NULL)
1387 27d434c2 2018-09-15 stsp err = got_error_from_errno();
1388 ca008b32 2018-07-22 stsp goto done;
1391 776d4d29 2018-06-17 stsp err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1393 776d4d29 2018-06-17 stsp goto done;
1396 776d4d29 2018-06-17 stsp s++; /* skip leading '/' */
1398 65a9bbe9 2018-09-15 stsp seglen = 0;
1399 b7cd37e5 2018-11-18 stsp while (*s) {
1400 776d4d29 2018-06-17 stsp struct got_tree_object *next_tree;
1402 776d4d29 2018-06-17 stsp if (*s != '/') {
1409 65a9bbe9 2018-09-15 stsp te = find_entry_by_name(tree, seg, seglen);
1410 db37e2c0 2018-06-21 stsp if (te == NULL) {
1411 d1451975 2018-11-11 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1412 776d4d29 2018-06-17 stsp goto done;
1415 b7cd37e5 2018-11-18 stsp if (*s == '\0')
1418 776d4d29 2018-06-17 stsp seg = s + 1;
1419 65a9bbe9 2018-09-15 stsp seglen = 0;
1422 776d4d29 2018-06-17 stsp err = got_object_open_as_tree(&next_tree, repo,
1424 db37e2c0 2018-06-21 stsp te = NULL;
1426 776d4d29 2018-06-17 stsp goto done;
1427 776d4d29 2018-06-17 stsp got_object_tree_close(tree);
1428 776d4d29 2018-06-17 stsp tree = next_tree;
1433 27d434c2 2018-09-15 stsp *id = got_object_id_dup(te->id);
1434 27d434c2 2018-09-15 stsp if (*id == NULL)
1435 27d434c2 2018-09-15 stsp return got_error_from_errno();
1437 d1451975 2018-11-11 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1439 776d4d29 2018-06-17 stsp if (commit)
1440 776d4d29 2018-06-17 stsp got_object_commit_close(commit);
1442 776d4d29 2018-06-17 stsp got_object_tree_close(tree);
1443 776d4d29 2018-06-17 stsp return err;
1446 07862c20 2018-09-15 stsp const struct got_error *
1447 07862c20 2018-09-15 stsp got_object_tree_path_changed(int *changed,
1448 07862c20 2018-09-15 stsp struct got_tree_object *tree01, struct got_tree_object *tree02,
1449 07862c20 2018-09-15 stsp const char *path, struct got_repository *repo)
1451 07862c20 2018-09-15 stsp const struct got_error *err = NULL;
1452 07862c20 2018-09-15 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1453 07862c20 2018-09-15 stsp struct got_tree_entry *te1 = NULL, *te2 = NULL;
1454 65a9bbe9 2018-09-15 stsp const char *seg, *s;
1455 3b7f9878 2018-11-18 stsp size_t seglen;
1457 07862c20 2018-09-15 stsp *changed = 0;
1459 07862c20 2018-09-15 stsp /* We are expecting an absolute in-repository path. */
1460 07862c20 2018-09-15 stsp if (path[0] != '/')
1461 07862c20 2018-09-15 stsp return got_error(GOT_ERR_NOT_ABSPATH);
1463 07862c20 2018-09-15 stsp /* We not do support comparing the root path. */
1464 07862c20 2018-09-15 stsp if (path[1] == '\0')
1465 07862c20 2018-09-15 stsp return got_error(GOT_ERR_BAD_PATH);
1467 07862c20 2018-09-15 stsp tree1 = tree01;
1468 07862c20 2018-09-15 stsp tree2 = tree02;
1470 07862c20 2018-09-15 stsp s++; /* skip leading '/' */
1472 65a9bbe9 2018-09-15 stsp seglen = 0;
1473 3b7f9878 2018-11-18 stsp while (*s) {
1474 07862c20 2018-09-15 stsp struct got_tree_object *next_tree1, *next_tree2;
1476 07862c20 2018-09-15 stsp if (*s != '/') {
1483 65a9bbe9 2018-09-15 stsp te1 = find_entry_by_name(tree1, seg, seglen);
1484 07862c20 2018-09-15 stsp if (te1 == NULL) {
1485 07862c20 2018-09-15 stsp err = got_error(GOT_ERR_NO_OBJ);
1486 07862c20 2018-09-15 stsp goto done;
1489 65a9bbe9 2018-09-15 stsp te2 = find_entry_by_name(tree2, seg, seglen);
1490 07862c20 2018-09-15 stsp if (te2 == NULL) {
1491 07862c20 2018-09-15 stsp *changed = 1;
1492 07862c20 2018-09-15 stsp goto done;
1495 07862c20 2018-09-15 stsp if (te1->mode != te2->mode) {
1496 07862c20 2018-09-15 stsp *changed = 1;
1497 07862c20 2018-09-15 stsp goto done;
1500 07862c20 2018-09-15 stsp if (got_object_id_cmp(te1->id, te2->id) == 0) {
1501 07862c20 2018-09-15 stsp *changed = 0;
1502 07862c20 2018-09-15 stsp goto done;
1505 3b7f9878 2018-11-18 stsp if (*s == '\0') { /* final path element */
1506 07862c20 2018-09-15 stsp *changed = 1;
1507 07862c20 2018-09-15 stsp goto done;
1510 07862c20 2018-09-15 stsp seg = s + 1;
1512 65a9bbe9 2018-09-15 stsp seglen = 0;
1514 07862c20 2018-09-15 stsp err = got_object_open_as_tree(&next_tree1, repo,
1516 07862c20 2018-09-15 stsp te1 = NULL;
1518 07862c20 2018-09-15 stsp goto done;
1519 a31cea73 2018-09-15 stsp if (tree1 != tree01)
1520 a31cea73 2018-09-15 stsp got_object_tree_close(tree1);
1521 07862c20 2018-09-15 stsp tree1 = next_tree1;
1523 07862c20 2018-09-15 stsp err = got_object_open_as_tree(&next_tree2, repo,
1525 07862c20 2018-09-15 stsp te2 = NULL;
1527 07862c20 2018-09-15 stsp goto done;
1528 a31cea73 2018-09-15 stsp if (tree2 != tree02)
1529 a31cea73 2018-09-15 stsp got_object_tree_close(tree2);
1530 07862c20 2018-09-15 stsp tree2 = next_tree2;
1534 a31cea73 2018-09-15 stsp if (tree1 && tree1 != tree01)
1535 07862c20 2018-09-15 stsp got_object_tree_close(tree1);
1536 a31cea73 2018-09-15 stsp if (tree2 && tree2 != tree02)
1537 07862c20 2018-09-15 stsp got_object_tree_close(tree2);
1538 77880158 2018-11-04 stsp return err;