Changeset 42a619b in mainline for uspace/app

Timestamp:

2011-08-19T08:58:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7dcb7981, 903bac0a, c2cf033

Parents:

ef7052ec (diff), d894fbd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/camp2011.

Location:

uspace/app

Files:

• bdsh/exec.c (modified) (3 diffs)
• trace/trace.c (modified) (3 diffs)

uspace/app/bdsh/exec.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -99 +100 @@
         char *tmp;
         int rc, retval, i;
-        fdi_node_t file_nodes[3];
-        fdi_node_t *file_nodes_p[4];
+        int file_handles[3];
+        int *file_handles_p[4];
         FILE *files[3];
 
@@ -111 +112 @@
         
         for (i = 0; i < 3 && files[i] != NULL; i++) {
-                if (fnode(files[i], &file_nodes[i]) == EOK) {
-                        file_nodes_p[i] = &file_nodes[i];
+                if (fhandle(files[i], &file_handles[i]) == EOK) {
+                        file_handles_p[i] = &file_handles[i];
                 }
                 else {
-                        file_nodes_p[i] = NULL;
+                        file_handles_p[i] = NULL;
                 }
         }
-        file_nodes_p[i] = NULL;
+        file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_nodes_p);
+        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_handles_p);
         free(tmp);
 

uspace/app/trace/trace.c

@@ -50 +50 @@
 #include <sys/types.h>
 #include <sys/typefmt.h>
+#include <vfs/vfs.h>
 
 #include <libc.h>
@@ -586 +587 @@
 
         /* Send default files */
-        fdi_node_t *files[4];
-        fdi_node_t stdin_node;
-        fdi_node_t stdout_node;
-        fdi_node_t stderr_node;
-        
-        if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
-                files[0] = &stdin_node;
+        int *files[4];
+        int fd_stdin;
+        int fd_stdout;
+        int fd_stderr;
+        
+        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
+                files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
-                files[1] = &stdout_node;
+        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
+                files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
-                files[2] = &stderr_node;
+        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
+                files[2] = &fd_stderr;
         else
                 files[2] = NULL;
@@ -761 +762 @@
         o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_OPEN, o);
-        o = oper_new("open_node", 4, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN_NODE, o);
         o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);