devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Filename tags were incorrectly retrieved from dircache when tagcache was loaded in

Browse source 
ram.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10202 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2006-07-12 12:50:26 +00:00
parent 3bddace4f8
commit df5d722c42
1 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
apps/tagcache.c
View file

@ -862,25 +862,27 @@ bool tagcache_retrieve(struct tagcache_search *tcs, int idxid,
} }
#ifdef HAVE_TC_RAMCACHE #ifdef HAVE_TC_RAMCACHE
if (tcs->ramsearch && TAG_FILENAME_RAM(tcs)) if (tcs->ramsearch)
{ {
struct tagfile_entry *ep; struct tagfile_entry *ep;
# ifdef HAVE_DIRCACHE # ifdef HAVE_DIRCACHE
if (tcs->type == tag_filename) if (tcs->type == tag_filename && hdr->indices[idxid].flag & FLAG_DIRCACHE)
{ {
dircache_copy_path((struct dircache_entry *)seek, dircache_copy_path((struct dircache_entry *)seek,
buf, size); buf, size);
return true; return true;
} }
else
# endif # endif
if (tcs->type != tag_filename)
{
ep = (struct tagfile_entry *)&hdr->tags[tcs->type][seek]; ep = (struct tagfile_entry *)&hdr->tags[tcs->type][seek];
strncpy(buf, ep->tag_data, size-1); strncpy(buf, ep->tag_data, size-1);
return true; return true;
} }
}
#endif #endif
if (!open_files(tcs)) if (!open_files(tcs))
@ -2213,7 +2215,7 @@ static bool load_tagcache(void)
struct index_entry *idx; struct index_entry *idx;
int rc, fd; int rc, fd;
char *p; char *p;
int i; int i, tag;
logf("loading tagcache to ram..."); logf("loading tagcache to ram...");
@ -2267,19 +2269,19 @@ static bool load_tagcache(void)
/* Load the tags. */ /* Load the tags. */
p = (char *)idx; p = (char *)idx;
for (i = 0; i < TAG_COUNT; i++) for (tag = 0; tag < TAG_COUNT; tag++)
{ {
struct tagfile_entry *fe; struct tagfile_entry *fe;
char buf[MAX_PATH]; char buf[MAX_PATH];
if (tagcache_is_numeric_tag(i)) if (tagcache_is_numeric_tag(tag))
continue ; continue ;
//p = ((void *)p+1); //p = ((void *)p+1);
p = (char *)((long)p & ~0x03) + 0x04; p = (char *)((long)p & ~0x03) + 0x04;
hdr->tags[i] = p; hdr->tags[tag] = p;
snprintf(buf, sizeof buf, TAGCACHE_FILE_INDEX, i); snprintf(buf, sizeof buf, TAGCACHE_FILE_INDEX, tag);
fd = open(buf, O_RDONLY); fd = open(buf, O_RDONLY);
if (fd < 0) if (fd < 0)
@ -2300,9 +2302,9 @@ static bool load_tagcache(void)
return false; return false;
} }
for (hdr->entry_count[i] = 0; for (hdr->entry_count[tag] = 0;
hdr->entry_count[i] < tch->entry_count; hdr->entry_count[tag] < tch->entry_count;
hdr->entry_count[i]++) hdr->entry_count[tag]++)
{ {
long pos; long pos;
@ -2319,7 +2321,7 @@ static bool load_tagcache(void)
} }
/* We have a special handling for the filename tags. */ /* We have a special handling for the filename tags. */
if (i == tag_filename) if (tag == tag_filename)
{ {
# ifdef HAVE_DIRCACHE # ifdef HAVE_DIRCACHE
const struct dircache_entry *dc; const struct dircache_entry *dc;
@ -2351,6 +2353,21 @@ static bool load_tagcache(void)
if (idx->flag & FLAG_DELETED) if (idx->flag & FLAG_DELETED)
continue; continue;
/* This flag must not be used yet. */
if (idx->flag & FLAG_DIRCACHE)
{
logf("internal error!");
close(fd);
return false;
}
if (idx->tag_seek[tag] != pos)
{
logf("corrupt data structures!");
close(fd);
return false;
}
# ifdef HAVE_DIRCACHE # ifdef HAVE_DIRCACHE
if (dircache_is_enabled()) if (dircache_is_enabled())
{ {
@ -2386,8 +2403,6 @@ static bool load_tagcache(void)
} }
close(testfd); close(testfd);
} }
idx->tag_seek[i] = pos;
} }
continue ; continue ;
@ -2413,7 +2428,7 @@ static bool load_tagcache(void)
logf("rc=0x%04x", rc); // 0x431 logf("rc=0x%04x", rc); // 0x431
logf("len=0x%04x", fe->tag_length); // 0x4000 logf("len=0x%04x", fe->tag_length); // 0x4000
logf("pos=0x%04x", lseek(fd, 0, SEEK_CUR)); // 0x433 logf("pos=0x%04x", lseek(fd, 0, SEEK_CUR)); // 0x433
logf("i=0x%02x", i); // 0x00 logf("tag=0x%02x", tag); // 0x00
close(fd); close(fd);
return false; return false;
} }