Changes in uspace/app/terminal/main.c [06d0c81:ce862ac] in mainline

File:

• uspace/app/terminal/main.c (modified) (6 diffs)

uspace/app/terminal/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
+#include <ui/ui.h>
 #include <stdio.h>
-#include <task.h>
-#include <ui/ui.h>
 #include "terminal.h"
 
@@ -45 +44 @@
         printf("Syntax: %s [<options>]\n", NAME);
         printf("\t-d <display-spec> Use the specified display\n");
+        printf("\t-c <command>      Run command instead of shell\n");
         printf("\t-topleft]         Place window to the top-left corner of "
             "the screen\n");
@@ -52 +52 @@
 {
         const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *command = "/app/bdsh";
         terminal_t *terminal = NULL;
         terminal_flags_t flags = 0;
@@ -68 +69 @@
 
                         display_spec = argv[i++];
+                } else if (str_cmp(argv[i], "-c") == 0) {
+                        ++i;
+                        if (i >= argc) {
+                                printf("Argument missing.\n");
+                                print_syntax();
+                                return 1;
+                        }
+
+                        command = argv[i++];
                 } else if (str_cmp(argv[i], "-topleft") == 0) {
                         ++i;
@@ -83 +93 @@
         }
 
-        rc = terminal_create(display_spec, 640, 480, flags, &terminal);
+        rc = terminal_create(display_spec, 640, 480, flags, command, &terminal);
         if (rc != EOK)
                 return 1;
 
-        task_retval(0);
-        async_manager();
+        ui_run(terminal->ui);
+
+        terminal_destroy(terminal);
         return 0;
 }