Changeset 7b11315 in mainline

Timestamp:

2021-11-01T21:24:05Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

24c452b3

Parents:

91ece11b

Message:

Add -c option to terminal to execute a command

This is to allow terminal-mode commands to be run from non-terminal
(i.e. GUI) context. This way is similar to what UN*X style OSses do.
For the record, I think this is a kludge. I think we can do better.
A console/terminal window could be automatically open when needed
(something like that happens in Windows?)

Location:

uspace/app/terminal

Files:

• main.c (modified) (5 diffs)
• terminal.c (modified) (2 diffs)
• terminal.h (modified) (1 diff)

uspace/app/terminal/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
         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 +53 @@
 {
         const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *command = "/app/bdsh";
         terminal_t *terminal = NULL;
         terminal_flags_t flags = 0;
@@ -68 +70 @@
 
                         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 +94 @@
         }
 
-        rc = terminal_create(display_spec, 640, 480, flags, &terminal);
+        rc = terminal_create(display_spec, 640, 480, flags, command, &terminal);
         if (rc != EOK)
                 return 1;

uspace/app/terminal/terminal.c

@@ -888 +888 @@
 
 errno_t terminal_create(const char *display_spec, sysarg_t width,
-    sysarg_t height, terminal_flags_t flags, terminal_t **rterm)
+    sysarg_t height, terminal_flags_t flags, const char *command,
+    terminal_t **rterm)
 {
         terminal_t *term;
@@ -1013 +1014 @@
 
         list_append(&term->link, &terms);
-        getterm(vc, "/app/bdsh");
+        getterm(vc, command);
 
         term->is_focused = true;

uspace/app/terminal/terminal.h

@@ -94 +94 @@
 
 extern errno_t terminal_create(const char *, sysarg_t, sysarg_t,
-    terminal_flags_t, terminal_t **);
+    terminal_flags_t, const char *, terminal_t **);
 extern void terminal_destroy(terminal_t *);