Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin-blame.c: use strbuf_readlink()
author
Junio C Hamano
<gitster@pobox.com>
Wed, 17 Dec 2008 20:37:53 +0000
(12:37 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 17 Dec 2008 21:36:35 +0000
(13:36 -0800)
When faking a commit out of the work tree contents, use strbuf_readlink()
to read the contents of symbolic links.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
builtin-blame.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
737e31a
)
diff --git
a/builtin-blame.c
b/builtin-blame.c
index a0d60145f26d32e45f4d04c22164cbe8060739ca..aae14ef8bb63abc598e2e3ce99bf64d5c07e0067 100644
(file)
--- a/
builtin-blame.c
+++ b/
builtin-blame.c
@@
-1996,7
+1996,6
@@
static struct commit *fake_working_tree_commit(const char *path, const char *con
if (!contents_from || strcmp("-", contents_from)) {
struct stat st;
const char *read_from;
if (!contents_from || strcmp("-", contents_from)) {
struct stat st;
const char *read_from;
- unsigned long fin_size;
if (contents_from) {
if (stat(contents_from, &st) < 0)
if (contents_from) {
if (stat(contents_from, &st) < 0)
@@
-2008,7
+2007,6
@@
static struct commit *fake_working_tree_commit(const char *path, const char *con
die("Cannot lstat %s", path);
read_from = path;
}
die("Cannot lstat %s", path);
read_from = path;
}
- fin_size = xsize_t(st.st_size);
mode = canon_mode(st.st_mode);
switch (st.st_mode & S_IFMT) {
case S_IFREG:
mode = canon_mode(st.st_mode);
switch (st.st_mode & S_IFMT) {
case S_IFREG:
@@
-2016,9
+2014,8
@@
static struct commit *fake_working_tree_commit(const char *path, const char *con
die("cannot open or read %s", read_from);
break;
case S_IFLNK:
die("cannot open or read %s", read_from);
break;
case S_IFLNK:
- if (
readlink(read_from, buf.buf, buf.alloc) != fin_size
)
+ if (
strbuf_readlink(&buf, read_from, st.st_size) < 0
)
die("cannot readlink %s", read_from);
die("cannot readlink %s", read_from);
- buf.len = fin_size;
break;
default:
die("unsupported file type %s", read_from);
break;
default:
die("unsupported file type %s", read_from);