summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cache.h3
-rw-r--r--read-tree.c66
-rw-r--r--tree.c65
3 files changed, 71 insertions, 63 deletions
diff --git a/cache.h b/cache.h
index 8b226b6..69dc877 100644
--- a/cache.h
+++ b/cache.h
@@ -122,6 +122,9 @@ extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned lon
extern int write_sha1_file(char *buf, unsigned len, unsigned char *return_sha1);
extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type);
+/* Read a tree into the cache */
+extern int read_tree(void *buffer, unsigned long size, int stage);
+
/* Convert to/from hex/sha1 representation */
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
diff --git a/read-tree.c b/read-tree.c
index 345d576..7b50fe6 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -7,67 +7,7 @@
static int stage = 0;
-static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode)
-{
- int len = strlen(pathname);
- unsigned int size = cache_entry_size(baselen + len);
- struct cache_entry *ce = malloc(size);
-
- memset(ce, 0, size);
-
- ce->ce_mode = create_ce_mode(mode);
- ce->ce_flags = create_ce_flags(baselen + len, stage);
- memcpy(ce->name, base, baselen);
- memcpy(ce->name + baselen, pathname, len+1);
- memcpy(ce->sha1, sha1, 20);
- return add_cache_entry(ce, 1);
-}
-
-static int read_tree_recursive(void *buffer, unsigned long size,
- const char *base, int baselen)
-{
- while (size) {
- int len = strlen(buffer)+1;
- unsigned char *sha1 = buffer + len;
- char *path = strchr(buffer, ' ')+1;
- unsigned int mode;
-
- if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
- return -1;
-
- buffer = sha1 + 20;
- size -= len + 20;
-
- if (S_ISDIR(mode)) {
- int retval;
- int pathlen = strlen(path);
- char *newbase = malloc(baselen + 1 + pathlen);
- void *eltbuf;
- char elttype[20];
- unsigned long eltsize;
-
- eltbuf = read_sha1_file(sha1, elttype, &eltsize);
- if (!eltbuf || strcmp(elttype, "tree"))
- return -1;
- memcpy(newbase, base, baselen);
- memcpy(newbase + baselen, path, pathlen);
- newbase[baselen + pathlen] = '/';
- retval = read_tree_recursive(eltbuf, eltsize,
- newbase,
- baselen + pathlen + 1);
- free(eltbuf);
- free(newbase);
- if (retval)
- return -1;
- continue;
- }
- if (read_one_entry(sha1, base, baselen, path, mode) < 0)
- return -1;
- }
- return 0;
-}
-
-static int read_tree(unsigned char *sha1, const char *base, int baselen)
+static int unpack_tree(unsigned char *sha1)
{
void *buffer;
unsigned long size;
@@ -75,7 +15,7 @@ static int read_tree(unsigned char *sha1, const char *base, int baselen)
buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
if (!buffer)
return -1;
- return read_tree_recursive(buffer, size, base, baselen);
+ return read_tree(buffer, size, stage);
}
static char *lockfile_name;
@@ -255,7 +195,7 @@ int main(int argc, char **argv)
usage(read_tree_usage);
if (stage > 3)
usage(read_tree_usage);
- if (read_tree(sha1, "", 0) < 0)
+ if (unpack_tree(sha1) < 0)
die("failed to unpack tree object %s", arg);
stage++;
}
diff --git a/tree.c b/tree.c
index 1aee098..e988aed 100644
--- a/tree.c
+++ b/tree.c
@@ -5,6 +5,71 @@
const char *tree_type = "tree";
+static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
+{
+ int len = strlen(pathname);
+ unsigned int size = cache_entry_size(baselen + len);
+ struct cache_entry *ce = malloc(size);
+
+ memset(ce, 0, size);
+
+ ce->ce_mode = create_ce_mode(mode);
+ ce->ce_flags = create_ce_flags(baselen + len, stage);
+ memcpy(ce->name, base, baselen);
+ memcpy(ce->name + baselen, pathname, len+1);
+ memcpy(ce->sha1, sha1, 20);
+ return add_cache_entry(ce, 1);
+}
+
+static int read_tree_recursive(void *buffer, unsigned long size,
+ const char *base, int baselen, int stage)
+{
+ while (size) {
+ int len = strlen(buffer)+1;
+ unsigned char *sha1 = buffer + len;
+ char *path = strchr(buffer, ' ')+1;
+ unsigned int mode;
+
+ if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
+ return -1;
+
+ buffer = sha1 + 20;
+ size -= len + 20;
+
+ if (S_ISDIR(mode)) {
+ int retval;
+ int pathlen = strlen(path);
+ char *newbase = malloc(baselen + 1 + pathlen);
+ void *eltbuf;
+ char elttype[20];
+ unsigned long eltsize;
+
+ eltbuf = read_sha1_file(sha1, elttype, &eltsize);
+ if (!eltbuf || strcmp(elttype, "tree"))
+ return -1;
+ memcpy(newbase, base, baselen);
+ memcpy(newbase + baselen, path, pathlen);
+ newbase[baselen + pathlen] = '/';
+ retval = read_tree_recursive(eltbuf, eltsize,
+ newbase,
+ baselen + pathlen + 1, stage);
+ free(eltbuf);
+ free(newbase);
+ if (retval)
+ return -1;
+ continue;
+ }
+ if (read_one_entry(sha1, base, baselen, path, mode, stage) < 0)
+ return -1;
+ }
+ return 0;
+}
+
+int read_tree(void *buffer, unsigned long size, int stage)
+{
+ return read_tree_recursive(buffer, size, "", 0, stage);
+}
+
struct tree *lookup_tree(unsigned char *sha1)
{
struct object *obj = lookup_object(sha1);