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

* Don't let GuestNode::Init() fail if the attribute directory could not be

Browse Source 
opened; not all file systems support this.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30654 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-05-07 07:20:57 +00:00
parent 05b2d32351
commit 843ce67e3d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/fs_shell/command_cp.cpp
+9 -8
View File
@@ -123,7 +123,7 @@ public:
virtual ~FSDomain() {} virtual ~FSDomain() {}
virtual fssh_status_t Open(const char *path, int openMode, Node *&node) = 0; virtual fssh_status_t Open(const char *path, int openMode, Node *&node) = 0;
virtual fssh_status_t CreateFile(const char *path, virtual fssh_status_t CreateFile(const char *path,
const struct fssh_stat &st, File *&file) = 0; const struct fssh_stat &st, File *&file) = 0;
virtual fssh_status_t CreateDirectory(const char *path, virtual fssh_status_t CreateDirectory(const char *path,
@@ -173,7 +173,7 @@ public:
{ {
if (!fAttrDir) if (!fAttrDir)
return 0; return 0;
fssh_set_errno(FSSH_B_OK); fssh_set_errno(FSSH_B_OK);
struct dirent *entry = fs_read_attr_dir(fAttrDir); struct dirent *entry = fs_read_attr_dir(fAttrDir);
if (!entry) if (!entry)
@@ -394,7 +394,7 @@ public:
_node = node; _node = node;
return FSSH_B_OK; return FSSH_B_OK;
} }
virtual fssh_status_t CreateFile(const char *path, virtual fssh_status_t CreateFile(const char *path,
const struct fssh_stat &st, File *&_file) const struct fssh_stat &st, File *&_file)
{ {
@@ -529,8 +529,9 @@ public:
// open the attribute directory // open the attribute directory
fAttrDir = _kern_open_attr_dir(fd, NULL); fAttrDir = _kern_open_attr_dir(fd, NULL);
if (fAttrDir < 0) if (fAttrDir < 0) {
return fAttrDir; // TODO: check if the file system supports attributes, and fail
}
return FSSH_B_OK; return FSSH_B_OK;
} }
@@ -539,7 +540,7 @@ public:
{ {
if (fAttrDir < 0) if (fAttrDir < 0)
return 0; return 0;
char buffer[sizeof(fssh_dirent) + B_ATTR_NAME_LENGTH]; char buffer[sizeof(fssh_dirent) + B_ATTR_NAME_LENGTH];
struct fssh_dirent *entry = (fssh_dirent *)buffer; struct fssh_dirent *entry = (fssh_dirent *)buffer;
int numRead = _kern_read_dir(fAttrDir, entry, sizeof(buffer), 1); int numRead = _kern_read_dir(fAttrDir, entry, sizeof(buffer), 1);
@@ -758,7 +759,7 @@ public:
_node = node; _node = node;
return FSSH_B_OK; return FSSH_B_OK;
} }
virtual fssh_status_t CreateFile(const char *path, virtual fssh_status_t CreateFile(const char *path,
const struct fssh_stat &st, File *&_file) const struct fssh_stat &st, File *&_file)
{ {
@@ -1183,7 +1184,7 @@ copy_entry(FSDomain *sourceDomain, const char *source,
fssh_strerror(bytesRead)); fssh_strerror(bytesRead));
} }
linkTo[bytesRead] = '\0'; // always NULL-terminate linkTo[bytesRead] = '\0'; // always NULL-terminate
// create the target link // create the target link
SymLink *link; SymLink *link;
error = targetDomain->CreateSymLink(target, linkTo, error = targetDomain->CreateSymLink(target, linkTo,