| /trunk/uspace/app/tester/vfs/vfs1.c |
|---|
| 32,6 → 32,8 |
| #include <string.h> |
| #include <sys/types.h> |
| #include <vfs.h> |
| #include <unistd.h> |
| #include <fcntl.h> |
| #include "../tester.h" |
| char *test_vfs1(bool quiet) |
| /trunk/uspace/lib/libc/include/fcntl.h |
|---|
| 0,0 → 1,43 |
| /* |
| * Copyright (c) 2007 Jakub Jermar |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup libc |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef LIBC_FCNTL_H_ |
| #define LIBC_FCNTL_H_ |
| extern int open(const char *, int, ...); |
| #endif |
| /** @} |
| */ |
| /trunk/uspace/lib/libc/include/vfs.h |
|---|
| 35,11 → 35,7 |
| #ifndef LIBC_VFS_H_ |
| #define LIBC_VFS_H_ |
| #include <sys/types.h> |
| extern int mount(const char *, const char *, const char *); |
| extern int open(const char *, int, ...); |
| extern ssize_t read(int, void *, size_t); |
| #endif |
| /trunk/uspace/lib/libc/generic/vfs.c |
|---|
| 33,6 → 33,8 |
| */ |
| #include <vfs.h> |
| #include <unistd.h> |
| #include <fcntl.h> |
| #include <ipc/ipc.h> |
| #include <ipc/services.h> |
| #include <async.h> |
| 140,7 → 142,7 |
| return res; |
| } |
| } |
| req = async_send_1(vfs_phone, VFS_READ, 0, &answer); |
| req = async_send_1(vfs_phone, VFS_READ, fildes, &answer); |
| if (ipc_data_read_send(vfs_phone, buf, sizeof(buf)) != EOK) { |
| async_wait_for(req, NULL); |
| async_serialize_end(); |
| 153,5 → 155,34 |
| return (ssize_t) IPC_GET_ARG1(answer); |
| } |
| ssize_t write(int fildes, const void *buf, size_t nbyte) |
| { |
| int res; |
| ipcarg_t rc; |
| ipc_call_t answer; |
| aid_t req; |
| futex_down(&vfs_phone_futex); |
| async_serialize_start(); |
| if (vfs_phone < 0) { |
| res = vfs_connect(); |
| if (res < 0) { |
| async_serialize_end(); |
| futex_up(&vfs_phone_futex); |
| return res; |
| } |
| } |
| req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer); |
| if (ipc_data_write_send(vfs_phone, buf, sizeof(buf)) != EOK) { |
| async_wait_for(req, NULL); |
| async_serialize_end(); |
| futex_up(&vfs_phone_futex); |
| return (ssize_t) rc; |
| } |
| async_wait_for(req, &rc); |
| async_serialize_end(); |
| futex_up(&vfs_phone_futex); |
| return (ssize_t) IPC_GET_ARG1(answer); |
| } |
| /** @} |
| */ |