diff options
| author | Jeff King <peff@peff.net> | 2017-03-16 10:27:12 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-16 11:17:00 -0700 |
| commit | eaeefc3276c45ff8f8c24775b7dd93155bef7d48 (patch) | |
| tree | 0efbfc9ff756f244375225d3e90383f32aa61b66 | |
| parent | 1cec8c634fb76ecee862ff88066f55b63b7d5ff7 (diff) | |
| download | git-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.tar.gz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/index-pack.c | 6 | ||||
| -rw-r--r-- | cache.h | 8 | ||||
| -rw-r--r-- | environment.c | 6 | ||||
| -rw-r--r-- | fast-import.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index f4b87c6c9f..a58bc6bee4 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1402,10 +1402,10 @@ static void final(const char *final_pack_name, const char *curr_pack_name, int keep_fd, keep_msg_len = strlen(keep_msg); if (!keep_name) - keep_fd = odb_pack_keep(name, sizeof(name), sha1); - else - keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600); + snprintf(name, sizeof(name), "%s/pack/pack-%s.keep", + get_object_directory(), sha1_to_hex(sha1)); + keep_fd = odb_pack_keep(keep_name ? keep_name : name); if (keep_fd < 0) { if (errno != EEXIST) die_errno(_("cannot write keep file '%s'"), @@ -1578,11 +1578,11 @@ extern int odb_mkstemp(char *template, size_t limit, const char *pattern); extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext); /* - * Create a pack .keep file in the object database's pack directory, for - * a pack with checksum "sha1". The return value is a file descriptor opened - * for writing, or -1 on error. The name of the keep file is written to "name". + * Create a pack .keep file named "name" (which should generally be the output + * of odb_pack_name). Returns a file descriptor opened for writing, or -1 on + * error. */ -extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1); +extern int odb_pack_keep(const char *name); /* * mmap the index file for the specified packfile (if it is not diff --git a/environment.c b/environment.c index c07fb17fb7..4cd20d7067 100644 --- a/environment.c +++ b/environment.c @@ -296,18 +296,16 @@ int odb_mkstemp(char *template, size_t limit, const char *pattern) return xmkstemp_mode(template, mode); } -int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1) +int odb_pack_keep(const char *name) { int fd; - snprintf(name, namesz, "%s/pack/pack-%s.keep", - get_object_directory(), sha1_to_hex(sha1)); fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600); if (0 <= fd) return fd; /* slow path */ - safe_create_leading_directories(name); + safe_create_leading_directories_const(name); return open(name, O_RDWR|O_CREAT|O_EXCL, 0600); } diff --git a/fast-import.c b/fast-import.c index 64fe602f0b..7f8371be3d 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)); |