projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 1.0.3
[git.git]
/
sha1_file.c
diff --git
a/sha1_file.c
b/sha1_file.c
index
fa22e9c
..
d451a94
100644
(file)
--- a/
sha1_file.c
+++ b/
sha1_file.c
@@
-81,6
+81,8
@@
char * sha1_to_hex(const unsigned char *sha1)
*buf++ = hex[val >> 4];
*buf++ = hex[val & 0xf];
}
*buf++ = hex[val >> 4];
*buf++ = hex[val & 0xf];
}
+ *buf = '\0';
+
return buffer;
}
return buffer;
}
@@
-464,7
+466,7
@@
struct packed_git *add_packed_git(char *path, int path_len, int local)
p->pack_last_used = 0;
p->pack_use_cnt = 0;
p->pack_local = local;
p->pack_last_used = 0;
p->pack_use_cnt = 0;
p->pack_local = local;
- if (
!get_sha1_hex(path + path_len - 40 -
4, sha1))
+ if (
(path_len > 44) && !get_sha1_hex(path + path_len - 4
4, sha1))
memcpy(p->sha1, sha1, 20);
return p;
}
memcpy(p->sha1, sha1, 20);
return p;
}
@@
-1274,7
+1276,7
@@
int move_temp_to_file(const char *tmpfile, char *filename)
unlink(tmpfile);
if (ret) {
if (ret != EEXIST) {
unlink(tmpfile);
if (ret) {
if (ret != EEXIST) {
- fprintf(stderr, "unable to write sha1 filename %s: %s", filename, strerror(ret));
+ fprintf(stderr, "unable to write sha1 filename %s: %s
\n
", filename, strerror(ret));
return -1;
}
/* FIXME!!! Collision check here ? */
return -1;
}
/* FIXME!!! Collision check here ? */
@@
-1313,7
+1315,7
@@
int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
}
if (errno != ENOENT) {
}
if (errno != ENOENT) {
- fprintf(stderr, "sha1 file %s: %s", filename, strerror(errno));
+ fprintf(stderr, "sha1 file %s: %s
\n
", filename, strerror(errno));
return -1;
}
return -1;
}
@@
-1321,7
+1323,7
@@
int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned cha
fd = mkstemp(tmpfile);
if (fd < 0) {
fd = mkstemp(tmpfile);
if (fd < 0) {
- fprintf(stderr, "unable to create temporary sha1 filename %s: %s", tmpfile, strerror(errno));
+ fprintf(stderr, "unable to create temporary sha1 filename %s: %s
\n
", tmpfile, strerror(errno));
return -1;
}
return -1;
}
@@
-1410,7
+1412,7
@@
int write_sha1_to_fd(int fd, const unsigned char *sha1)
size = write(fd, buf + posn, objsize - posn);
if (size <= 0) {
if (!size) {
size = write(fd, buf + posn, objsize - posn);
if (size <= 0) {
if (!size) {
- fprintf(stderr, "write closed");
+ fprintf(stderr, "write closed
\n
");
} else {
perror("write ");
}
} else {
perror("write ");
}