diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 09:36:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-17 13:36:30 -0800 |
| commit | b11b7e13f48ee283738e21fea9f775cd40ca0562 (patch) | |
| tree | f1c1a1a271f018865e1b95b5885cb71520da13a8 /builtin-apply.c | |
| parent | 53682f0c9e7545c6fa891896a5de4ad441a76147 (diff) | |
| download | git-b11b7e13f48ee283738e21fea9f775cd40ca0562.tar.gz git-b11b7e13f48ee283738e21fea9f775cd40ca0562.tar.xz | |
Add generic 'strbuf_readlink()' helper function
It was already what 'git apply' did in read_old_data(), just export it
as a real function, and make it be more generic.
In particular, this handles the case of the lstat() st_size data not
matching the readlink() return value properly (which apparently happens
at least on NTFS under Linux). But as a result of this you could also
use the new function without even knowing how big the link is going to
be, and it will allocate an appropriately sized buffer.
So we pass in the st_size of the link as just a hint, rather than a
fixed requirement.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 4c4d1e177..07244b073 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1559,10 +1559,8 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf) { switch (st->st_mode & S_IFMT) { case S_IFLNK: - strbuf_grow(buf, st->st_size); - if (readlink(path, buf->buf, st->st_size) != st->st_size) - return -1; - strbuf_setlen(buf, st->st_size); + if (strbuf_readlink(buf, path, st->st_size) < 0) + return error("unable to read symlink %s", path); return 0; case S_IFREG: if (strbuf_read_file(buf, path, st->st_size) != st->st_size) |