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

* As read_pos() and write_pos() are supposed to be platform functions,

Browse Source 
they return the respective error codes.
* Fixed the open mode conversion function.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11597 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-03-06 13:32:33 +00:00
parent 7d0617a836
commit 76a14666e0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/add-ons/kernel/file_systems/fs_shell/sysdep.c
+10 -7
View File
@@ -20,6 +20,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "stat_util.h"
// Let the FS think, we are the root user. // Let the FS think, we are the root user.
uid_t uid_t
@@ -144,7 +146,8 @@ read_pos(int fd, fs_off_t _pos, void *data, size_t nbytes)
if (lseek(fd, pos, SEEK_SET) < 0) { if (lseek(fd, pos, SEEK_SET) < 0) {
perror("read lseek"); perror("read lseek");
return FS_EINVAL; errno = EINVAL;
return -1;
} }
ret = read(fd, data, nbytes); ret = read(fd, data, nbytes);
@@ -165,7 +168,8 @@ write_pos(int fd, fs_off_t _pos, const void *data, size_t nbytes)
if (lseek(fd, pos, SEEK_SET) < 0) { if (lseek(fd, pos, SEEK_SET) < 0) {
perror("read lseek"); perror("read lseek");
return FS_EINVAL; errno = EINVAL;
return -1;
} }
ret = write(fd, data, nbytes); ret = write(fd, data, nbytes);
@@ -284,7 +288,7 @@ to_platform_open_mode(int myMode)
} }
// the flags // the flags
SET_OPEN_MODE_FLAG(O_CLOEXEC, MY_O_CLOEXEC) //SET_OPEN_MODE_FLAG(O_CLOEXEC, MY_O_CLOEXEC)
SET_OPEN_MODE_FLAG(O_NONBLOCK, MY_O_NONBLOCK) SET_OPEN_MODE_FLAG(O_NONBLOCK, MY_O_NONBLOCK)
SET_OPEN_MODE_FLAG(O_EXCL, MY_O_EXCL) SET_OPEN_MODE_FLAG(O_EXCL, MY_O_EXCL)
SET_OPEN_MODE_FLAG(O_CREAT, MY_O_CREAT) SET_OPEN_MODE_FLAG(O_CREAT, MY_O_CREAT)
@@ -292,13 +296,12 @@ to_platform_open_mode(int myMode)
SET_OPEN_MODE_FLAG(O_APPEND, MY_O_APPEND) SET_OPEN_MODE_FLAG(O_APPEND, MY_O_APPEND)
SET_OPEN_MODE_FLAG(O_NOCTTY, MY_O_NOCTTY) SET_OPEN_MODE_FLAG(O_NOCTTY, MY_O_NOCTTY)
SET_OPEN_MODE_FLAG(O_NOTRAVERSE, MY_O_NOTRAVERSE) SET_OPEN_MODE_FLAG(O_NOTRAVERSE, MY_O_NOTRAVERSE)
SET_OPEN_MODE_FLAG(O_ACCMODE, MY_O_ACCMODE) //SET_OPEN_MODE_FLAG(O_TEXT, MY_O_TEXT)
SET_OPEN_MODE_FLAG(O_TEXT, MY_O_TEXT) //SET_OPEN_MODE_FLAG(O_BINARY, MY_O_BINARY)
SET_OPEN_MODE_FLAG(O_BINARY, MY_O_BINARY)
#undef SET_OPEN_MODE_FLAG #undef SET_OPEN_MODE_FLAG
return myFlags; return mode;
} }