@matheusbsbs / matheus-bagliano / commits / 32205655dc

fsmonitor OSX: compile with DC_SHA1=YesPlease

As we'll address in subsequent commits the "DC_SHA1=YesPlease" is not on by default on OSX, instead we use Apple Common Crypto's SHA-1 implementation. In 6beb2688d33 (fsmonitor: relocate socket file if .git directory is remote, 2022-10-04) the build was broken with "DC_SHA1=YesPlease" (and probably other non-"APPLE_COMMON_CRYPTO" SHA-1 backends). So let's extract the fix for this from [1] to get the build working again with "DC_SHA1=YesPlease". In addition to the fix in [1] we also need to replace "SHA_DIGEST_LENGTH" with "GIT_MAX_RAWSZ". 1. https://lore.kernel.org/git/c085fc15b314abcb5e5ca6b4ee5ac54a28327cab.1665326258.git.gitgitgadget@gmail.com/ Signed-off-by: Eric DeCosta <edecosta@mathworks.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Oct 19, 2022 at 03:03 UTC 32205655dc7ce44863bf79fb05bf170d9ad6da32

1 file changed +5 -5

compat/fsmonitor/fsm-ipc-darwin.c

+5 -5

@@ -10,10 +10,10 @@ static GIT_PATH_FUNC(fsmonitor_ipc__get_default_path, "fsmonitor--daemon.ipc")

10 const char *fsmonitor_ipc__get_path(struct repository *r)

11 {

12 static const char *ipc_path = NULL;

13 - SHA_CTX sha1ctx;

13 + git_SHA_CTX sha1ctx;

14 char *sock_dir = NULL;

15 struct strbuf ipc_file = STRBUF_INIT;

16 - unsigned char hash[SHA_DIGEST_LENGTH];

16 + unsigned char hash[GIT_MAX_RAWSZ];

18 if (!r)

19 BUG("No repository passed into fsmonitor_ipc__get_path");

@@ -28,9 +28,9 @@ const char *fsmonitor_ipc__get_path(struct repository *r)

28 return ipc_path;

29 }

31 - SHA1_Init(&sha1ctx);

32 - SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree));

33 - SHA1_Final(hash, &sha1ctx);

31 + git_SHA1_Init(&sha1ctx);

32 + git_SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree));

33 + git_SHA1_Final(hash, &sha1ctx);

35 repo_config_get_string(r, "fsmonitor.socketdir", &sock_dir);