Changes in uspace/app/getterm/getterm.c [5a6cc679:a35b458] in mainline

File:

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

uspace/app/getterm/getterm.c

@@ -42 +42 @@
 #include <loc.h>
 #include <vfs/vfs.h>
+#include <str.h>
 #include "version.h"
 #include "welcome.h"
@@ -62 +63 @@
         if (fclose(*stream))
                 return;
-        
+
         *stream = NULL;
-        
+
         int oldfd;
         errno_t rc = vfs_lookup_open(path, WALK_REGULAR, mode, &oldfd);
         if (rc != EOK)
                 return;
-        
+
         if (oldfd != fd) {
                 int newfd;
                 if (vfs_clone(oldfd, fd, false, &newfd) != EOK)
                         return;
-                
+
                 assert(newfd == fd);
 
@@ -80 +81 @@
                         return;
         }
-        
+
         *stream = fdopen(fd, fmode);
 }
@@ -92 +93 @@
                 return 1;
         }
-        
+
         char *term = *argv;
         argv++;
         argc--;
-        
+
         char *locfs = *argv;
         argv++;
         argc--;
-        
+
         bool print_msg = false;
         bool wait = false;
-        
+
         while ((argc > 0) && (str_cmp(*argv, "--") != 0)) {
                 if (str_cmp(*argv, "--msg") == 0) {
@@ -113 +114 @@
                         return 2;
                 }
-                
+
                 argv++;
                 argc--;
         }
-        
+
         if (argc < 1) {
                 usage();
                 return 3;
         }
-        
+
         /* Skip "--" */
         argv++;
         argc--;
-        
+
         char *cmd = *argv;
         char **args = argv;
-        
+
         if (wait) {
                 /* Wait for the terminal service to be ready */
@@ -140 +141 @@
                 }
         }
-        
+
         char term_node[LOC_NAME_MAXLEN];
         snprintf(term_node, LOC_NAME_MAXLEN, "%s/%s", locfs, term);
-        
+
         reopen(&stdin, 0, term_node, MODE_READ, "r");
         reopen(&stdout, 1, term_node, MODE_WRITE, "w");
         reopen(&stderr, 2, term_node, MODE_WRITE, "w");
-        
+
         if (stdin == NULL)
                 return 4;
-        
+
         if (stdout == NULL)
                 return 5;
-        
+
         if (stderr == NULL)
                 return 6;
-        
+
         /*
          * FIXME: fdopen() should actually detect that we are opening a console
@@ -162 +163 @@
          */
         setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
-        
+
         version_print(term);
         if (print_msg)
                 welcome_msg_print();
-        
+
         task_id_t id;
         task_wait_t twait;
-        
+
         errno_t rc = task_spawnv(&id, &twait, cmd, (const char * const *) args);
         if (rc != EOK) {
@@ -176 +177 @@
                 return rc;
         }
-        
+
         task_exit_t texit;
         int retval;
@@ -185 +186 @@
                 return rc;
         }
-        
+
         return 0;
 }