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 /environment.c | |
| parent | sha1_file.c: make pack-name helper globally accessible (diff) | |
| download | tgif-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.tar.xz | |
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>
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 6 |
1 files changed, 2 insertions, 4 deletions
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); } |