/trunk/uspace/lib/libc/generic/task.c |
---|
100,10 → 100,10 |
/* Send default files */ |
inode_t *files[4]; |
inode_t stdin_node; |
inode_t stdout_node; |
inode_t stderr_node; |
fdi_node_t *files[4]; |
fdi_node_t stdin_node; |
fdi_node_t stdout_node; |
fdi_node_t stderr_node; |
if ((stdin != NULL) && (stdin != &stdin_null)) { |
fnode(stdin, &stdin_node); |
/trunk/uspace/lib/libc/generic/loader.c |
---|
205,13 → 205,13 |
* @return Zero on success or negative error code. |
* |
*/ |
int loader_set_files(loader_t *ldr, inode_t *const files[]) |
int loader_set_files(loader_t *ldr, fdi_node_t *const files[]) |
{ |
/* |
* Serialize the arguments into a single array. First |
* compute size of the buffer needed. |
*/ |
inode_t *const *ap = files; |
fdi_node_t *const *ap = files; |
size_t count = 0; |
while (*ap != NULL) { |
count++; |
218,7 → 218,8 |
ap++; |
} |
inode_t *files_buf = (inode_t *) malloc(count * sizeof(inode_t)); |
fdi_node_t *files_buf; |
files_buf = (fdi_node_t *) malloc(count * sizeof(fdi_node_t)); |
if (files_buf == NULL) |
return ENOMEM; |
231,7 → 232,7 |
ipc_call_t answer; |
aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer); |
ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf, |
count * sizeof(inode_t)); |
count * sizeof(fdi_node_t)); |
if (rc != EOK) { |
async_wait_for(req, NULL); |
return rc; |
/trunk/uspace/lib/libc/generic/vfs/vfs.c |
---|
223,7 → 223,7 |
return _open(path, L_FILE, oflag); |
} |
int open_node(inode_t *node, int oflag) |
int open_node(fdi_node_t *node, int oflag) |
{ |
futex_down(&vfs_phone_futex); |
async_serialize_start(); |
332,7 → 332,7 |
return devmap_device_connect((dev_handle_t) device, 0); |
} |
void fd_node(int fildes, inode_t *node) |
void fd_node(int fildes, fdi_node_t *node) |
{ |
futex_down(&vfs_phone_futex); |
async_serialize_start(); |
/trunk/uspace/lib/libc/generic/io/io.c |
---|
144,7 → 144,7 |
return stream; |
} |
FILE *fopen_node(inode_t *node, const char *mode) |
FILE *fopen_node(fdi_node_t *node, const char *mode) |
{ |
int flags; |
if (!parse_mode(mode, &flags)) |
353,7 → 353,7 |
return -1; |
} |
void fnode(FILE *stream, inode_t *node) |
void fnode(FILE *stream, fdi_node_t *node) |
{ |
if (stream->fd >= 0) { |
fd_node(stream->fd, node); |