Changes in uspace/app/getterm/getterm.c [1d6dd2a:8d2dd7f2] in mainline

File:

• uspace/app/getterm/getterm.c (modified) (4 diffs)

uspace/app/getterm/getterm.c

@@ -42 +42 @@
 #include <loc.h>
 #include <vfs/vfs.h>
-#include <str.h>
 #include "version.h"
 #include "welcome.h"
@@ -66 +65 @@
         *stream = NULL;
         
-        int oldfd;
-        errno_t rc = vfs_lookup_open(path, WALK_REGULAR, mode, &oldfd);
-        if (rc != EOK)
+        int oldfd = vfs_lookup_open(path, WALK_REGULAR, mode);
+        if (oldfd < 0)
                 return;
         
         if (oldfd != fd) {
-                int newfd;
-                if (vfs_clone(oldfd, fd, false, &newfd) != EOK)
+                if (vfs_clone(oldfd, fd, false) != fd)
                         return;
                 
-                assert(newfd == fd);
-
                 if (vfs_put(oldfd))
                         return;
@@ -134 +129 @@
                 /* Wait for the terminal service to be ready */
                 service_id_t service_id;
-                errno_t rc = loc_service_get_id(term, &service_id, IPC_FLAG_BLOCKING);
+                int rc = loc_service_get_id(term, &service_id, IPC_FLAG_BLOCKING);
                 if (rc != EOK) {
                         printf("%s: Error waiting on %s (%s)\n", APP_NAME, term,
@@ -171 +166 @@
         task_wait_t twait;
         
-        errno_t rc = task_spawnv(&id, &twait, cmd, (const char * const *) args);
+        int rc = task_spawnv(&id, &twait, cmd, (const char * const *) args);
         if (rc != EOK) {
                 printf("%s: Error spawning %s (%s)\n", APP_NAME, cmd,