summaryrefslogtreecommitdiff
path: root/sys/src/cmd/hgfs/tree.c
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@localhost>2011-06-27 10:07:19 +0200
committercinap_lenrek <cinap_lenrek@localhost>2011-06-27 10:07:19 +0200
commitd0485d345db63b0ee82301251339e72d6093107d (patch)
tree439e795fccf06ecb48364f8ed51ac416105364bf /sys/src/cmd/hgfs/tree.c
parent402ee30714c2cefa9116ff2031672bc6a8cd5c0b (diff)
hgfs: change semantics of log to contain only the file list
Diffstat (limited to 'sys/src/cmd/hgfs/tree.c')
-rw-r--r--sys/src/cmd/hgfs/tree.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/sys/src/cmd/hgfs/tree.c b/sys/src/cmd/hgfs/tree.c
index 6e1d34831..5e5a36856 100644
--- a/sys/src/cmd/hgfs/tree.c
+++ b/sys/src/cmd/hgfs/tree.c
@@ -201,41 +201,41 @@ loadchangestree(Revlog *changelog, Revlog *manifest, Revinfo *ri)
{
char buf[BUFSZ], *p, *e;
Hashstr *ht[256], *he, **hp;
- int fd, done, line, n;
+ int fd, n;
Revtree *t;
+ vlong off;
if((fd = revlogopentemp(changelog, hashrev(changelog, ri->chash))) < 0)
return nil;
- done = 0;
- line = 0;
+ off = seek(fd, ri->logoff, 0);
+ if(off < 0){
+ close(fd);
+ return nil;
+ }
+
memset(ht, 0, sizeof(ht));
p = buf;
e = buf + BUFSZ;
- while((n = read(fd, p, e - p)) > 0){
+ while((off - ri->logoff) < ri->loglen){
+ if((n = read(fd, p, e - p)) <= 0)
+ break;
p += n;
while((p > buf) && (e = memchr(buf, '\n', p - buf))){
*e++ = 0;
- if(++line >= 4){
- if(*buf == 0){
- done = 1;
- break;
- }
-
- he = malloc(sizeof(*he) + strlen(buf)+1);
- hp = &ht[hashstr(strcpy(he->str, buf)) % nelem(ht)];
- he->next = *hp;
- *hp = he;
- }
+ he = malloc(sizeof(*he) + strlen(buf)+1);
+ hp = &ht[hashstr(strcpy(he->str, buf)) % nelem(ht)];
+ he->next = *hp;
+ *hp = he;
- p -= e - buf;
+ n = e - buf;
+ p -= n;
if(p > buf)
memmove(buf, e, p - buf);
+ off += n;
}
- if(done)
- break;
e = buf + BUFSZ;
}
close(fd);