return 0;
}
+int get_sha1_file(const char *path, unsigned char *result)
+{
+ char buffer[60];
+ int fd = open(path, O_RDONLY);
+ int len;
+
+ if (fd < 0)
+ return -1;
+ len = read(fd, buffer, sizeof(buffer));
+ close(fd);
+ if (len < 40)
+ return -1;
+ return get_sha1_hex(buffer, result);
+}
+
+int get_sha1(const char *str, unsigned char *sha1)
+{
+ static char pathname[PATH_MAX];
+ static const char *prefix[] = {
+ "",
+ "refs",
+ "refs/tags",
+ "refs/heads",
+ "refs/snap",
+ NULL
+ };
+ const char *gitdir;
+ const char **p;
+
+ if (!get_sha1_hex(str, sha1))
+ return 0;
+
+ gitdir = ".git";
+ for (p = prefix; *p; p++) {
+ snprintf(pathname, sizeof(pathname), "%s/%s/%s", gitdir, *p, str);
+ if (!get_sha1_file(pathname, sha1))
+ return 0;
+ }
+
+ return -1;
+}
+
char * sha1_to_hex(const unsigned char *sha1)
{
static char buffer[50];
if (!base) {
char *sha1_file_directory = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
int len = strlen(sha1_file_directory);
- base = malloc(len + 60);
+ base = xmalloc(len + 60);
memcpy(base, sha1_file_directory, len);
memset(base+len, 0, 60);
base[len] = '/';
return NULL;
bytes = strlen(buffer) + 1;
- buf = malloc(*size);
- if (!buf)
- return NULL;
+ buf = xmalloc(*size);
memcpy(buf, buffer + bytes, stream.total_out - bytes);
bytes = stream.total_out - bytes;
return NULL;
}
-void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1,
- unsigned long *size,
- unsigned char *tree_sha1_return)
+void *read_object_with_reference(const unsigned char *sha1,
+ const unsigned char *required_type,
+ unsigned long *size,
+ unsigned char *actual_sha1_return)
{
char type[20];
void *buffer;
unsigned long isize;
- int was_commit = 0;
- unsigned char tree_sha1[20];
-
- buffer = read_sha1_file(sha1, type, &isize);
-
- /*
- * We might have read a commit instead of a tree, in which case
- * we parse out the tree_sha1 and attempt to read from there.
- * (buffer + 5) is because the tree sha1 is always at offset 5
- * in a commit record ("tree ").
- */
- if (buffer &&
- !strcmp(type, "commit") &&
- !get_sha1_hex(buffer + 5, tree_sha1)) {
- free(buffer);
- buffer = read_sha1_file(tree_sha1, type, &isize);
- was_commit = 1;
- }
+ unsigned char actual_sha1[20];
- /*
- * Now do we have something and if so is it a tree?
- */
- if (!buffer || strcmp(type, "tree")) {
- free(buffer);
- return NULL;
- }
+ memcpy(actual_sha1, sha1, 20);
+ while (1) {
+ int ref_length = -1;
+ const char *ref_type = NULL;
- *size = isize;
- if (tree_sha1_return)
- memcpy(tree_sha1_return, was_commit ? tree_sha1 : sha1, 20);
- return buffer;
+ buffer = read_sha1_file(actual_sha1, type, &isize);
+ if (!buffer)
+ return NULL;
+ if (!strcmp(type, required_type)) {
+ *size = isize;
+ if (actual_sha1_return)
+ memcpy(actual_sha1_return, actual_sha1, 20);
+ return buffer;
+ }
+ /* Handle references */
+ else if (!strcmp(type, "commit"))
+ ref_type = "tree ";
+ else if (!strcmp(type, "tag"))
+ ref_type = "object ";
+ else {
+ free(buffer);
+ return NULL;
+ }
+ ref_length = strlen(ref_type);
+
+ if (memcmp(buffer, ref_type, ref_length) ||
+ get_sha1_hex(buffer + ref_length, actual_sha1)) {
+ free(buffer);
+ return NULL;
+ }
+ /* Now we have the ID of the referred-to object in
+ * actual_sha1. Check again. */
+ }
}
-int write_sha1_file(char *buf, unsigned len, const char *type, unsigned char *returnsha1)
+int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *returnsha1)
{
int size;
char *compressed;
int fd, hdrlen;
/* Generate the header */
- hdrlen = sprintf(hdr, "%s %d", type, len)+1;
+ hdrlen = sprintf(hdr, "%s %lu", type, len)+1;
/* Sha1.. */
SHA1_Init(&c);
memset(&stream, 0, sizeof(stream));
deflateInit(&stream, Z_BEST_COMPRESSION);
size = deflateBound(&stream, len+hdrlen);
- compressed = malloc(size);
+ compressed = xmalloc(size);
/* Compress it */
stream.next_out = compressed;