development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

for_each_alternate_ref: use strbuf for path allocation

Browse source 
We have a string with ".../objects" pointing to the
alternate object store, and overwrite bits of it to look at
other paths in the (potential) git repository holding it.
This works because the only path we care about is "refs",
which is shorter than "objects".

Using a strbuf to hold the path lets us get rid of some
magic numbers, and makes it more obvious that the memory
operations are safe.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-02-08 15:52:54 -05:00 committed by Junio C Hamano
parent ece657f399
commit 5e8c968c64
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
transport.c
View file

@ -1214,34 +1214,34 @@ struct alternate_refs_data {
static int refs_from_alternate_cb(struct alternate_object_database *e,
void *data)
{
char *other;
size_t len;
struct strbuf path = STRBUF_INIT;
size_t base_len;
struct remote *remote;
struct transport *transport;
const struct ref *extra;
struct alternate_refs_data *cb = data;
other = real_pathdup(e->path);
if (!other)
return 0;
len = strlen(other);
if (!strbuf_realpath(&path, e->path, 0))
goto out;
if (!strbuf_strip_suffix(&path, "/objects"))
goto out;
base_len = path.len;
if (len < 8 || memcmp(other + len - 8, "/objects", 8))
goto out;
/* Is this a git repository with refs? */
memcpy(other + len - 8, "/refs", 6);
if (!is_directory(other))
strbuf_addstr(&path, "/refs");
if (!is_directory(path.buf))
goto out;
other[len - 8] = '\0';
remote = remote_get(other);
transport = transport_get(remote, other);
strbuf_setlen(&path, base_len);
remote = remote_get(path.buf);
transport = transport_get(remote, path.buf);
for (extra = transport_get_remote_refs(transport);
extra;
extra = extra->next)
cb->fn(extra, cb->data);
transport_disconnect(transport);
out:
free(other);
strbuf_release(&path);
return 0;
}