i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Activated the index functions and ported it to the the new VFS API.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8965 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-09-15 02:08:54 +00:00
parent 1b41fce458
commit 40f2ce7d20
1 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+45 -53
View File
@@ -1744,7 +1744,7 @@ bfs_read_attr(void *_ns, void *_node, const char *name, int type, void *buffer,
return inode->ReadAttribute(name, type, pos, (uint8 *)buffer, _length); return inode->ReadAttribute(name, type, pos, (uint8 *)buffer, _length);
} }
#endif
// #pragma mark - // #pragma mark -
// Index functions // Index functions
@@ -1772,61 +1772,61 @@ bfs_open_indexdir(void *_ns, void **_cookie)
static status_t static status_t
bfs_close_indexdir(void *_ns, void *_cookie) bfs_close_indexdir(fs_volume _fs, fs_cookie _cookie)
{ {
FUNCTION(); FUNCTION();
if (_ns == NULL || _cookie == NULL) if (_fs == NULL || _cookie == NULL)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_fs;
RETURN_ERROR(bfs_close_dir(_ns, volume->IndicesNode(), _cookie)); RETURN_ERROR(bfs_close_dir(_fs, volume->IndicesNode(), _cookie));
} }
static status_t static status_t
bfs_free_indexdir_cookie(void *_ns, void *_node, void *_cookie) bfs_free_indexdir_cookie(fs_volume _fs, fs_cookie _cookie)
{ {
FUNCTION(); FUNCTION();
if (_ns == NULL || _cookie == NULL) if (_fs == NULL || _cookie == NULL)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_fs;
RETURN_ERROR(bfs_free_dir_cookie(_ns, volume->IndicesNode(), _cookie)); RETURN_ERROR(bfs_free_dir_cookie(_fs, volume->IndicesNode(), _cookie));
} }
static status_t static status_t
bfs_rewind_indexdir(void *_ns, void *_cookie) bfs_rewind_indexdir(fs_volume _fs, fs_cookie _cookie)
{ {
FUNCTION(); FUNCTION();
if (_ns == NULL || _cookie == NULL) if (_fs == NULL || _cookie == NULL)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_fs;
RETURN_ERROR(bfs_rewind_dir(_ns, volume->IndicesNode(), _cookie)); RETURN_ERROR(bfs_rewind_dir(_fs, volume->IndicesNode(), _cookie));
} }
static status_t static status_t
bfs_read_indexdir(void *_ns, void *_cookie, long *num, struct dirent *dirent, size_t bufferSize) bfs_read_indexdir(fs_volume _fs, fs_cookie _cookie, struct dirent *dirent, size_t bufferSize, uint32 *_num)
{ {
FUNCTION(); FUNCTION();
if (_ns == NULL || _cookie == NULL) if (_fs == NULL || _cookie == NULL)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_fs;
RETURN_ERROR(bfs_read_dir(_ns, volume->IndicesNode(), _cookie, num, dirent, bufferSize)); RETURN_ERROR(bfs_read_dir(_fs, volume->IndicesNode(), _cookie, dirent, bufferSize, _num));
} }
static status_t static status_t
bfs_create_index(void *_ns, const char *name, int type, int flags) bfs_create_index(fs_volume _fs, const char *name, uint32 type, uint32 flags)
{ {
FUNCTION_START(("name = \"%s\", type = %d, flags = %d\n", name, type, flags)); FUNCTION_START(("name = \"%s\", type = %d, flags = %d\n", name, type, flags));
if (_ns == NULL || name == NULL || *name == '\0') if (_fs == NULL || name == NULL || *name == '\0')
return B_BAD_VALUE; return B_BAD_VALUE;
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_fs;
if (volume->IsReadOnly()) if (volume->IsReadOnly())
return B_READ_ONLY_DEVICE; return B_READ_ONLY_DEVICE;
@@ -1884,30 +1884,13 @@ bfs_remove_index(void *_ns, const char *name)
static status_t static status_t
bfs_rename_index(void *ns, const char *oldname, const char *newname) bfs_stat_index(fs_volume _fs, const char *name, struct stat *stat)
{
FUNCTION_START(("from = %s, to = %s\n", oldname, newname));
// Well, renaming an index doesn't make that much sense, as you
// would also need to remove every file in it (or the index
// would contain wrong data)
// But in that case, you can better remove the old one, and
// create a new one...
// There is also no way to call this function from a userland
// application.
RETURN_ERROR(B_ENTRY_NOT_FOUND);
}
static status_t
bfs_stat_index(void *_ns, const char *name, struct index_info *indexInfo)
{ {
FUNCTION_START(("name = %s\n", name)); FUNCTION_START(("name = %s\n", name));
if (_ns == NULL || name == NULL || indexInfo == NULL) if (_fs == NULL || name == NULL || stat == NULL)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_fs;
Index index(volume); Index index(volume);
status_t status = index.SetTo(name); status_t status = index.SetTo(name);
if (status < B_OK) if (status < B_OK)
@@ -1915,12 +1898,19 @@ bfs_stat_index(void *_ns, const char *name, struct index_info *indexInfo)
bfs_inode *node = index.Node()->Node(); bfs_inode *node = index.Node()->Node();
indexInfo->type = index.Type(); stat->st_type = index.Type();
indexInfo->size = node->data.Size(); stat->st_size = node->data.Size();
indexInfo->modification_time = (time_t)(node->LastModifiedTime() >> INODE_TIME_SHIFT); stat->st_mode = node->Mode();
indexInfo->creation_time = (time_t)(node->CreateTime() >> INODE_TIME_SHIFT);
indexInfo->uid = node->UserID(); stat->st_nlink = 1;
indexInfo->gid = node->GroupID(); stat->st_blksize = 65536;
stat->st_uid = node->UserID();
stat->st_gid = node->GroupID();
stat->st_atime = time(NULL);
stat->st_mtime = stat->st_ctime = (time_t)(node->LastModifiedTime() >> INODE_TIME_SHIFT);
stat->st_crtime = (time_t)(node->CreateTime() >> INODE_TIME_SHIFT);
return B_OK; return B_OK;
} }
@@ -1929,7 +1919,7 @@ bfs_stat_index(void *_ns, const char *name, struct index_info *indexInfo)
// #pragma mark - // #pragma mark -
// Query functions // Query functions
#if 0
static status_t static status_t
bfs_open_query(void *_ns, const char *queryString, ulong flags, port_id port, bfs_open_query(void *_ns, const char *queryString, ulong flags, port_id port,
long token, void **cookie) long token, void **cookie)
@@ -2093,8 +2083,10 @@ static file_system_info sBeFileSystem = {
&bfs_free_dir_cookie, // free_dircookie &bfs_free_dir_cookie, // free_dircookie
&bfs_read_dir, // readdir &bfs_read_dir, // readdir
&bfs_rewind_dir, // rewinddir &bfs_rewind_dir, // rewinddir
#if 0
#endif NULL, NULL, NULL, NULL, NULL, // attr dir
NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, // attr
#if 0 #if 0
/* attribute directory operations */ /* attribute directory operations */
&bfs_open_attrdir, // open attr dir &bfs_open_attrdir, // open attr dir
@@ -2109,18 +2101,18 @@ static file_system_info sBeFileSystem = {
&bfs_remove_attr, // remove attr &bfs_remove_attr, // remove attr
&bfs_rename_attr, // rename attr &bfs_rename_attr, // rename attr
&bfs_stat_attr, // stat attr &bfs_stat_attr, // stat attr
#endif
/* index directory & index operations */ /* index directory & index operations */
&bfs_open_indexdir, // open index dir &bfs_open_indexdir, // open index dir
&bfs_close_indexdir, // close index dir &bfs_close_indexdir, // close index dir
&bfs_free_indexdir_cookie, // free index dir cookie &bfs_free_indexdir_cookie, // free index dir cookie
&bfs_rewind_indexdir, // rewind index dir
&bfs_read_indexdir, // read index dir &bfs_read_indexdir, // read index dir
&bfs_rewind_indexdir, // rewind index dir
&bfs_create_index, // create index &bfs_create_index, // create index
&bfs_remove_index, // remove index &bfs_remove_index, // remove index
&bfs_rename_index, // rename index
&bfs_stat_index, // stat index &bfs_stat_index, // stat index
#if 0
/* query operations */ /* query operations */
&bfs_open_query, // open query &bfs_open_query, // open query
&bfs_close_query, // close query &bfs_close_query, // close query