From afceb0f7755a87d0dd2194e95f26c9dc8f4bc688 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 15 Sep 2017 23:55:57 -0500 Subject: [PATCH] gc: use 's' type character for fscanf The ISO C standard states that using a field width together with the 'c' type character will read the exact amount specified; if that amount of bytes is not available, a match error occurs. This patch allows the t6500 test to pass on the musl libc, and `git gc` to behave correctly on syystems utilising musl. Signed-off-by: A. Wilcox --- builtin/gc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/gc.c b/builtin/gc.c index 3c78fcb..bb2d6c1 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -258,7 +258,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid) int should_exit; if (!scan_fmt) - scan_fmt = xstrfmt("%s %%%dc", "%"SCNuMAX, HOST_NAME_MAX); + scan_fmt = xstrfmt("%s %%%ds", "%"SCNuMAX, HOST_NAME_MAX); fp = fopen(pidfile_path, "r"); memset(locking_host, 0, sizeof(locking_host)); should_exit = -- 2.10.0