Changeset 301ff30 in mainline
- Timestamp:
- 2009-06-03T22:47:08Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 99272a3
- Parents:
- 98000fb
- Location:
- uspace
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/libc/generic/io/io.c
r98000fb r301ff30 145 145 } 146 146 147 FILE *fopen_node( fs_node_t *node, const char *mode)147 FILE *fopen_node(inode_t *node, const char *mode) 148 148 { 149 149 int flags; … … 354 354 } 355 355 356 void fnode(FILE *stream, fs_node_t *node)356 void fnode(FILE *stream, inode_t *node) 357 357 { 358 358 if (stream->fd >= 0) { -
uspace/lib/libc/generic/loader.c
r98000fb r301ff30 206 206 * 207 207 */ 208 int loader_set_files(loader_t *ldr, fs_node_t *const files[])208 int loader_set_files(loader_t *ldr, inode_t *const files[]) 209 209 { 210 210 /* … … 212 212 * compute size of the buffer needed. 213 213 */ 214 fs_node_t *const *ap = files;214 inode_t *const *ap = files; 215 215 size_t count = 0; 216 216 while (*ap != NULL) { … … 219 219 } 220 220 221 fs_node_t *files_buf = (fs_node_t *) malloc(count * sizeof(fs_node_t));221 inode_t *files_buf = (inode_t *) malloc(count * sizeof(inode_t)); 222 222 if (files_buf == NULL) 223 223 return ENOMEM; … … 232 232 aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer); 233 233 ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf, 234 count * sizeof( fs_node_t));234 count * sizeof(inode_t)); 235 235 if (rc != EOK) { 236 236 async_wait_for(req, NULL); -
uspace/lib/libc/generic/task.c
r98000fb r301ff30 101 101 102 102 /* Send default files */ 103 fs_node_t *files[4];104 fs_node_t stdin_node;105 fs_node_t stdout_node;106 fs_node_t stderr_node;103 inode_t *files[4]; 104 inode_t stdin_node; 105 inode_t stdout_node; 106 inode_t stderr_node; 107 107 108 108 if ((stdin != NULL) && (stdin != &stdin_null)) { -
uspace/lib/libc/generic/vfs/vfs.c
r98000fb r301ff30 224 224 } 225 225 226 int open_node( fs_node_t *node, int oflag)226 int open_node(inode_t *node, int oflag) 227 227 { 228 228 futex_down(&vfs_phone_futex); … … 333 333 } 334 334 335 void fd_node(int fildes, fs_node_t *node)335 void fd_node(int fildes, inode_t *node) 336 336 { 337 337 futex_down(&vfs_phone_futex); -
uspace/lib/libc/include/loader/loader.h
r98000fb r301ff30 51 51 extern int loader_set_pathname(loader_t *, const char *); 52 52 extern int loader_set_args(loader_t *, char *const[]); 53 extern int loader_set_files(loader_t *, fs_node_t *const[]);53 extern int loader_set_files(loader_t *, inode_t *const[]); 54 54 extern int loader_load_program(loader_t *); 55 55 extern int loader_run(loader_t *); -
uspace/lib/libc/include/loader/pcb.h
r98000fb r301ff30 61 61 int filc; 62 62 /** Preset files. */ 63 fs_node_t **filv;63 inode_t **filv; 64 64 65 65 /* -
uspace/lib/libc/include/vfs/vfs.h
r98000fb r301ff30 45 45 dev_handle_t dev_handle; 46 46 fs_index_t index; 47 } fs_node_t;47 } inode_t; 48 48 49 49 extern char *absolutize(const char *, size_t *); … … 52 52 unsigned int flags); 53 53 54 extern int open_node( fs_node_t *node, int oflag);54 extern int open_node(inode_t *node, int oflag); 55 55 extern int fd_phone(int); 56 extern void fd_node(int, fs_node_t *);56 extern void fd_node(int, inode_t *); 57 57 58 extern FILE *fopen_node( fs_node_t *node, const char *);58 extern FILE *fopen_node(inode_t *node, const char *); 59 59 extern int fphone(FILE *); 60 extern void fnode(FILE *stream, fs_node_t *node);60 extern void fnode(FILE *stream, inode_t *node); 61 61 62 62 #endif -
uspace/srv/loader/main.c
r98000fb r301ff30 82 82 static char **filv = NULL; 83 83 /** Buffer holding all preset files */ 84 static fs_node_t *fil_buf = NULL;84 static inode_t *fil_buf = NULL; 85 85 86 86 static elf_info_t prog_info; … … 243 243 } 244 244 245 if ((buf_size % sizeof( fs_node_t)) != 0) {245 if ((buf_size % sizeof(inode_t)) != 0) { 246 246 ipc_answer_0(callid, EINVAL); 247 247 ipc_answer_0(rid, EINVAL); … … 268 268 ipc_data_write_finalize(callid, fil_buf, buf_size); 269 269 270 int count = buf_size / sizeof( fs_node_t);270 int count = buf_size / sizeof(inode_t); 271 271 272 272 /* Allocate filvv */ 273 filv = malloc((count + 1) * sizeof( fs_node_t *));273 filv = malloc((count + 1) * sizeof(inode_t *)); 274 274 275 275 if (filv == NULL) {
Note:
See TracChangeset
for help on using the changeset viewer.