Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Implemented O_DIRECTORY in BFS.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34280 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-11-26 14:19:01 +00:00
parent 00362625b9
commit f2505b1583
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/add-ons/kernel/file_systems/bfs/Inode.cpp
View File

@ -2514,7 +2514,7 @@ Inode::Create(Transaction& transaction, Inode* parent, const char* name,
if (tree->Find((uint8*)name, (uint16)strlen(name), &offset) == B_OK) { if (tree->Find((uint8*)name, (uint16)strlen(name), &offset) == B_OK) {
// Return if the file should be a directory/link or opened in // Return if the file should be a directory/link or opened in
// exclusive mode // exclusive mode
if (S_ISDIR(mode) || S_ISLNK(mode) || openMode & O_EXCL) if (S_ISDIR(mode) || S_ISLNK(mode) || (openMode & O_EXCL) != 0)
return B_FILE_EXISTS; return B_FILE_EXISTS;
Vnode vnode(volume, offset); Vnode vnode(volume, offset);
@ -2525,28 +2525,25 @@ Inode::Create(Transaction& transaction, Inode* parent, const char* name,
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
} }
// if it's a directory, bail out! if (inode->IsDirectory() && (openMode & O_RWMASK) != O_RDONLY)
if (inode->IsDirectory())
return B_IS_A_DIRECTORY; return B_IS_A_DIRECTORY;
if ((openMode & O_DIRECTORY) != 0 && !inode->IsDirectory())
return B_NOT_A_DIRECTORY;
// we want to open the file, so we should have the rights to do so // we want to open the file, so we should have the rights to do so
if (inode->CheckPermissions(open_mode_to_access(openMode)) != B_OK) if (inode->CheckPermissions(open_mode_to_access(openMode)
| ((openMode & O_TRUNC) != 0 ? W_OK : 0)) != B_OK)
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
if ((openMode & O_TRUNC) != 0) { if ((openMode & O_TRUNC) != 0) {
// we need write access in order to truncate the file
status = inode->CheckPermissions(W_OK);
if (status != B_OK)
return status;
// truncate the existing file // truncate the existing file
inode->WriteLockInTransaction(transaction); inode->WriteLockInTransaction(transaction);
status_t status = inode->SetFileSize(transaction, 0); status_t status = inode->SetFileSize(transaction, 0);
if (status >= B_OK) if (status == B_OK)
status = inode->WriteBack(transaction); status = inode->WriteBack(transaction);
if (status < B_OK) if (status != B_OK)
return status; return status;
} }
@ -2564,8 +2561,12 @@ Inode::Create(Transaction& transaction, Inode* parent, const char* name,
return B_OK; return B_OK;
} }
} else if (parent != NULL && (mode & S_ATTR_DIR) == 0) } else if (parent != NULL && (mode & S_ATTR_DIR) == 0) {
return B_BAD_VALUE; return B_BAD_VALUE;
} else if ((openMode & O_DIRECTORY) != 0) {
// TODO: we might need to return B_NOT_A_DIRECTORY here
return B_ENTRY_NOT_FOUND;
}
status_t status; status_t status;

4
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
View File

@ -1229,9 +1229,11 @@ bfs_open(fs_volume* _volume, fs_vnode* _node, int openMode, void** _cookie)
// any data from it. // any data from it.
if (inode->IsDirectory() && (openMode & O_RWMASK) != O_RDONLY) if (inode->IsDirectory() && (openMode & O_RWMASK) != O_RDONLY)
return B_IS_A_DIRECTORY; return B_IS_A_DIRECTORY;
if ((openMode & O_DIRECTORY) != 0 && !inode->IsDirectory())
return B_NOT_A_DIRECTORY;
status_t status = inode->CheckPermissions(open_mode_to_access(openMode) status_t status = inode->CheckPermissions(open_mode_to_access(openMode)
| (openMode & O_TRUNC ? W_OK : 0)); | ((openMode & O_TRUNC) != 0 ? W_OK : 0));
if (status != B_OK) if (status != B_OK)
RETURN_ERROR(status); RETURN_ERROR(status);