Changeset 5126f80 in mainline for uspace/app/trace/trace.c

Timestamp:

2017-03-08T11:42:17Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0d35511

Parents:

a737667e

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-08 11:42:17)

git-committer:

Jakub Jermar <jakub@…> (2017-03-08 11:42:17)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1946

Original commit messages:

1946: Jiri Zarevucky 2013-08-06 Relativize mount, add root handle to libc and remove root from VFS server. This wraps up the "relativization" phase.

Breakage:

• Dynamic builds broken
• Mount table lookups by name

File:

• uspace/app/trace/trace.c (modified) (2 diffs)

uspace/app/trace/trace.c

@@ -512 +512 @@
                 goto error;
 
-        /* Send program pathname */
+        /* Send program. */
         rc = loader_set_program_path(ldr, path);
         if (rc != EOK)
@@ -523 +523 @@
 
         /* Send default files */
+        int fd_root;
         int fd_stdin;
         int fd_stdout;
         int fd_stderr;
+        
+        fd_root = vfs_root();
+        if (fd_root >= 0) {
+                rc = loader_add_inbox(ldr, "root", fd_root);
+                close(fd_root);
+                if (rc != EOK)
+                        goto error;
+        }
         
         if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK)) {