From eaeefc3276c45ff8f8c24775b7dd93155bef7d48 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 16 Mar 2017 10:27:12 -0400 Subject: odb_pack_keep(): stop generating keepfile name The odb_pack_keep() function generates the name of a .keep file and opens it. This has two problems: 1. It requires a fixed-size buffer to create the filename and doesn't notice when the result is truncated. 2. Of the two callers, one sometimes wants to open a filename it already has, which makes things awkward (it has to do so manually, and skips the leading-directory creation). Instead, let's have odb_pack_keep() just open the file. Generating the name isn't hard, and a future patch will switch callers over to odb_pack_name() anyway. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- fast-import.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'fast-import.c') diff --git a/fast-import.c b/fast-import.c index 64fe602f0..7f8371be3 100644 --- a/fast-import.c +++ b/fast-import.c @@ -944,7 +944,9 @@ static char *keep_pack(const char *curr_index_name) static const char *keep_msg = "fast-import"; int keep_fd; - keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1); + snprintf(name, sizeof(name), "%s/pack/pack-%s.keep", + get_object_directory(), sha1_to_hex(pack_data->sha1)); + keep_fd = odb_pack_keep(name); if (keep_fd < 0) die_errno("cannot create keep file"); write_or_die(keep_fd, keep_msg, strlen(keep_msg)); -- cgit v1.2.1