commit 758dc042e8fc2399dc58d96ce6d80b4a0adf4705 from: Josiah Frentsos via: Stefan Sperling date: Sun Nov 06 12:06:06 2022 UTC remove trailing whitespace; patch by Josiah Frentsos commit - 36c7cfbb2a9b646bfb1658fca4e34bc63a46ec42 commit + 758dc042e8fc2399dc58d96ce6d80b4a0adf4705 blob - 60a1c5bc79f30b8bcef6067390300dc398a8e35c blob + 58d9841511822c15006e19116bc4d2ca6c90013a --- CHANGES +++ CHANGES @@ -41,7 +41,7 @@ - allow got_object_parse_tree() to reuse entries buffer allocations for speed - show a more useful error if the size of a packed object won't fit in 64 bits - switch integers used for counting objects while indexing packs to unsigned -- refresh cached list of pack index paths while searching a packed object +- refresh cached list of pack index paths while searching a packed object - introduce gotd(8) and gotsh(1); WIP and not yet provided in binary packages - close parent's end of imsg pipe before waiting for a child process to exit - fix detection of SIGTERM in tog; this signal was accidentally being ignored blob - 5a2b73f904f22fa621428bd0c020578588edbdf3 blob + acc4545ba9aeab1061576f340ba1ba16ed227d59 --- gotsh/gotsh.c +++ gotsh/gotsh.c @@ -93,7 +93,7 @@ main(int argc, char *argv[]) if (unix_socket_path_env) { if (strlcpy(unix_socket_path, unix_socket_path_env, - sizeof(unix_socket_path)) >= sizeof(unix_socket_path)) + sizeof(unix_socket_path)) >= sizeof(unix_socket_path)) errx(1, "gotd socket path too long"); } else { strlcpy(unix_socket_path, GOTD_UNIX_SOCKET, blob - 40a8a89af35bb2ad537815f6c18fd5fd38f1d013 blob + 58d428b99c43b2fba80028b6233bcd4ff6c7e4a4 --- gotweb/libexec/got-read-blob/Makefile +++ gotweb/libexec/got-read-blob/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - cf8660bd4f6b01319d7acb1039c734dfa629da91 blob + 669332cc8be5487a26cc868b873f782c7e351623 --- gotweb/libexec/got-read-commit/Makefile +++ gotweb/libexec/got-read-commit/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 8879f48df6de273719bba71dc1c09ad0f12400e0 blob + d81d4666fc3206a3008ddfc673992c5ec3265bd9 --- gotweb/libexec/got-read-gitconfig/Makefile +++ gotweb/libexec/got-read-gitconfig/Makefile @@ -1,11 +1,10 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" PROG= got-read-gitconfig SRCS= got-read-gitconfig.c error.c inflate.c object_parse.c \ path.c privsep.c sha1.c gitconfig.c pollfd.c - + CPPFLAGS = -I${.CURDIR}/../../../include -I${.CURDIR}/../../../lib LDADD = -lutil -lz DPADD = ${LIBZ} ${LIBUTIL} blob - 4b42a2accc0b3f70acfa45cbe4996b1eb9298e2f blob + abc9574b7efb93c971c76b3576970c8c19ba0e14 --- gotweb/libexec/got-read-gotconfig/Makefile +++ gotweb/libexec/got-read-gotconfig/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 5de9e23dff74ce4b6002d8f839c2f1daaf5db9bf blob + 1c3afaf56bad757cf3c8b9574bc12521adbda7bb --- gotweb/libexec/got-read-object/Makefile +++ gotweb/libexec/got-read-object/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - f2b80f8b19809b9120fa5cd3263b48fac0ba01b1 blob + 9c1bf08b6d1c6cea526cdb38361ef89dfce5bc32 --- gotweb/libexec/got-read-pack/Makefile +++ gotweb/libexec/got-read-pack/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 203f0dabf48adc72a071b923ee0ca33f8cb7cc14 blob + 450ee15c54e4904304143c4129f1adf9fd085073 --- gotweb/libexec/got-read-tag/Makefile +++ gotweb/libexec/got-read-tag/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 5e2f4bda5f9910c7dd4473e99d088fe961a387ec blob + 20c0a23b3bf5a858afe4cd8a8e2d57c5194dd074 --- gotweb/libexec/got-read-tree/Makefile +++ gotweb/libexec/got-read-tree/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 40a8a89af35bb2ad537815f6c18fd5fd38f1d013 blob + 58d428b99c43b2fba80028b6233bcd4ff6c7e4a4 --- gotwebd/libexec/got-read-blob/Makefile +++ gotwebd/libexec/got-read-blob/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - cf8660bd4f6b01319d7acb1039c734dfa629da91 blob + 669332cc8be5487a26cc868b873f782c7e351623 --- gotwebd/libexec/got-read-commit/Makefile +++ gotwebd/libexec/got-read-commit/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 72c1dd13680cea2b0ea7f5c2e72f7eaa2496f77c blob + d81d4666fc3206a3008ddfc673992c5ec3265bd9 --- gotwebd/libexec/got-read-gitconfig/Makefile +++ gotwebd/libexec/got-read-gitconfig/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 4b42a2accc0b3f70acfa45cbe4996b1eb9298e2f blob + abc9574b7efb93c971c76b3576970c8c19ba0e14 --- gotwebd/libexec/got-read-gotconfig/Makefile +++ gotwebd/libexec/got-read-gotconfig/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 5de9e23dff74ce4b6002d8f839c2f1daaf5db9bf blob + 1c3afaf56bad757cf3c8b9574bc12521adbda7bb --- gotwebd/libexec/got-read-object/Makefile +++ gotwebd/libexec/got-read-object/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - f2b80f8b19809b9120fa5cd3263b48fac0ba01b1 blob + 9c1bf08b6d1c6cea526cdb38361ef89dfce5bc32 --- gotwebd/libexec/got-read-pack/Makefile +++ gotwebd/libexec/got-read-pack/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 203f0dabf48adc72a071b923ee0ca33f8cb7cc14 blob + 450ee15c54e4904304143c4129f1adf9fd085073 --- gotwebd/libexec/got-read-tag/Makefile +++ gotwebd/libexec/got-read-tag/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 5e2f4bda5f9910c7dd4473e99d088fe961a387ec blob + 20c0a23b3bf5a858afe4cd8a8e2d57c5194dd074 --- gotwebd/libexec/got-read-tree/Makefile +++ gotwebd/libexec/got-read-tree/Makefile @@ -1,4 +1,3 @@ - .include "../../../got-version.mk" .include "../Makefile.inc" blob - 8498bedda0021930f8e588d1ef4adb98a845c1f0 blob + 37def8a54e88bcdfbc49e4cc2f7a41fd8175f3b5 --- lib/got_lib_object_parse.h +++ lib/got_lib_object_parse.h @@ -38,7 +38,7 @@ const struct got_error *got_object_read_tree(struct go const struct got_error *got_object_parse_tag(struct got_tag_object **, uint8_t *, size_t); -const struct got_error *got_object_read_tag(struct got_tag_object **, int, +const struct got_error *got_object_read_tag(struct got_tag_object **, int, struct got_object_id *, size_t); const struct got_error *got_read_file_to_mem(uint8_t **, size_t *, FILE *); blob - b2f06f459a64bbfe86dc489ba4e83470590c3872 blob + 114e0ca8c6f110af5f8ebfd87ac1cdd552fbc92c --- lib/object_parse.c +++ lib/object_parse.c @@ -1153,7 +1153,7 @@ done: } const struct got_error * -got_object_read_tag(struct got_tag_object **tag, int fd, +got_object_read_tag(struct got_tag_object **tag, int fd, struct got_object_id *expected_id, size_t expected_size) { const struct got_error *err = NULL; blob - c172bdfa834cbcbf2bd89e3875832ed19ece76b0 blob + 0cab79b8b8f5f06becd7bc5a485ab1f33f7e022e --- lib/repository.c +++ lib/repository.c @@ -336,14 +336,14 @@ got_repo_pack_fds_close(int *pack_fds) } const struct got_error * -got_repo_temp_fds_open(int **temp_fds) +got_repo_temp_fds_open(int **temp_fds) { return open_tempfiles(temp_fds, GOT_REPO_NUM_TEMPFILES, GOT_REPO_NUM_TEMPFILES); } void -got_repo_temp_fds_set(struct got_repository *repo, int *temp_fds) +got_repo_temp_fds_set(struct got_repository *repo, int *temp_fds) { int i; blob - 0b79ca86d66d8554b1da1a6a03a6ea7e0d1a3541 blob + 6f66eecd32025d4fd1d36dcd102e422f5e949b63 --- lib/serve.c +++ lib/serve.c @@ -189,7 +189,7 @@ send_ref(int outfd, uint8_t *id, const char *refname, char buf[GOT_PKT_MAX]; size_t len, capalen = 0; - if (got_sha1_digest_to_str(id, hex, sizeof(hex)) == NULL) + if (got_sha1_digest_to_str(id, hex, sizeof(hex)) == NULL) return got_error(GOT_ERR_BAD_OBJ_ID); len = snprintf(buf, sizeof(buf), "%s %s", hex, refname); @@ -230,7 +230,7 @@ send_zero_refs(int outfd, int chattygot) memset(&zero, 0, sizeof(zero)); - if (got_sha1_digest_to_str(zero, hex, sizeof(hex)) == NULL) + if (got_sha1_digest_to_str(zero, hex, sizeof(hex)) == NULL) return got_error(GOT_ERR_BAD_OBJ_ID); len = snprintf(buf, sizeof(buf), "%s capabilities^{}", hex); @@ -673,7 +673,7 @@ send_ack(int outfd, uint8_t *id, int chattygot) char buf[GOT_PKT_MAX]; int len; - if (got_sha1_digest_to_str(id, hex, sizeof(hex)) == NULL) + if (got_sha1_digest_to_str(id, hex, sizeof(hex)) == NULL) return got_error(GOT_ERR_BAD_OBJ_ID); len = snprintf(buf, sizeof(buf), "ACK %s\n", hex); @@ -846,8 +846,8 @@ relay_progress_reports(struct imsgbuf *ibuf, int outfd "%d commits colored, " "%d objects found, " "deltify %d%%%s", - iprog.ncolored, - iprog.nfound, + iprog.ncolored, + iprog.nfound, p_deltify, eol); if (n >= sizeof(buf) - 1) break;