Changeset 3f0a7971 in mainline for uspace/app

Timestamp:

2010-11-18T22:34:23Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63b4f90

Parents:

c7137738 (diff), 45f04f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (1 diff)
• bdsh/cmds/modules/help/help.c (modified) (4 diffs)
• bdsh/scli.c (modified) (1 diff)
• getterm/Makefile (modified) (1 diff)
• getterm/getterm.c (modified) (4 diffs)
• getterm/version.c (modified) (1 diff)
• getterm/welcome.c (added)
• getterm/welcome.h (added)
• init/init.c (modified) (5 diffs)
• mkfat/mkfat.c (modified) (3 diffs)
• netecho/netecho.c (modified) (1 diff)
• nettest1/nettest1.c (modified) (3 diffs)
• nettest2/nettest2.c (modified) (3 diffs)
• test_serial/test_serial.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -68 +68 @@
         unsigned int argc;
         unsigned int i, j;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         uint8_t *blk;
         size_t size, bytes, rows;

uspace/app/bdsh/cmds/modules/help/help.c

@@ -45 +45 @@
 extern const char *progname;
 
-#define HELP_IS_MODULE   1
-#define HELP_IS_BUILTIN  0
-#define HELP_IS_RUBBISH  -1
+#define HELP_IS_COMMANDS        2
+#define HELP_IS_MODULE          1
+#define HELP_IS_BUILTIN         0
+#define HELP_IS_RUBBISH         -1
 
 volatile int mod_switch = -1;
@@ -55 +56 @@
 {
         int rc = HELP_IS_RUBBISH;
+
+        if (str_cmp(cmd, "commands") == 0)
+                return HELP_IS_COMMANDS;
 
         rc = is_builtin(cmd);
@@ -90 +94 @@
 }
 
-int cmd_help(char *argv[])
+static void help_commands(void)
 {
+        builtin_t *cmd;
         module_t *mod;
-        builtin_t *cmd;
-        unsigned int i = 0;
-        int rc = 0;
-        int argc;
-        int level = HELP_SHORT;
+        unsigned int i;
 
-        argc = cli_count_args(argv);
-
-        if (argc > 3) {
-                printf("\nToo many arguments to `%s', try:\n", cmdname);
-                help_cmd_help(HELP_SHORT);
-                return CMD_FAILURE;
-        }
-
-        if (argc == 3) {
-                if (!str_cmp("extended", argv[2]))
-                        level = HELP_LONG;
-                else
-                        level = HELP_SHORT;
-        }
-
-        if (argc > 1) {
-                rc = is_mod_or_builtin(argv[1]);
-                switch (rc) {
-                case HELP_IS_RUBBISH:
-                        printf("Invalid command %s\n", argv[1]);
-                        return CMD_FAILURE;
-                case HELP_IS_MODULE:
-                        help_module(mod_switch, level);
-                        return CMD_SUCCESS;
-                case HELP_IS_BUILTIN:
-                        help_builtin(mod_switch, level);
-                        return CMD_SUCCESS;
-                }
-        }
-
-        printf("\n  Available commands are:\n");
+        printf("\n  Bdsh built-in commands:\n");
         printf("  ------------------------------------------------------------\n");
 
@@ -154 +125 @@
         printf("\n  Try %s %s for more information on how `%s' works.\n\n",
                 cmdname, cmdname, cmdname);
+}
+
+/** Display survival tips. ('help' without arguments) */
+static void help_survival(void)
+{
+        printf("Don't panic!\n\n");
+
+        printf("This is Bdsh, the Brain dead shell, currently "
+            "the primary user interface to HelenOS. Bdsh allows you to enter "
+            "commands and supports history (Up, Down arrow keys), "
+            "line editing (Left Arrow, Right Arrow, Home, End, Backspace), "
+            "selection (Shift + movement keys), copy and paste (Ctrl-C, "
+            "Ctrl-V), similar to common desktop environments.\n\n");
+
+        printf("The most basic filesystem commands are Bdsh builtins. Type "
+            "'help commands' [Enter] to see the list of Bdsh builtin commands. "
+            "Other commands are external executables located in the /app and "
+            "/srv directories. Type 'ls /app' [Enter] and 'ls /srv' [Enter] "
+            "to see their list. You can execute an external command simply "
+            "by entering its name (e.g. type 'tetris' [Enter]).\n\n");
+
+        printf("HelenOS has virtual consoles (VCs). You can switch between "
+            "these using the F1-F11 keys.\n\n");
+
+        printf("This is but a small glimpse of what you can do with HelenOS. "
+            "To learn more please point your browser to the HelenOS User's "
+            "Guide: http://trac.helenos.org/trac.fcgi/wiki/UsersGuide\n\n");
+}
+
+int cmd_help(char *argv[])
+{
+        int rc = 0;
+        int argc;
+        int level = HELP_SHORT;
+
+        argc = cli_count_args(argv);
+
+        if (argc > 3) {
+                printf("\nToo many arguments to `%s', try:\n", cmdname);
+                help_cmd_help(HELP_SHORT);
+                return CMD_FAILURE;
+        }
+
+        if (argc == 3) {
+                if (!str_cmp("extended", argv[2]))
+                        level = HELP_LONG;
+                else
+                        level = HELP_SHORT;
+        }
+
+        if (argc > 1) {
+                rc = is_mod_or_builtin(argv[1]);
+                switch (rc) {
+                case HELP_IS_RUBBISH:
+                        printf("Invalid topic %s\n", argv[1]);
+                        return CMD_FAILURE;
+                case HELP_IS_COMMANDS:
+                        help_commands();
+                        return CMD_SUCCESS;
+                case HELP_IS_MODULE:
+                        help_module(mod_switch, level);
+                        return CMD_SUCCESS;
+                case HELP_IS_BUILTIN:
+                        help_builtin(mod_switch, level);
+                        return CMD_SUCCESS;
+                }
+        }
+
+        help_survival();
 
         return CMD_SUCCESS;

uspace/app/bdsh/scli.c

@@ -89 +89 @@
                 exit(EXIT_FAILURE);
 
-        printf("Welcome to %s - %s\nType `help' at any time for usage information.\n",
-                progname, PACKAGE_STRING);
-
         while (!cli_quit) {
                 get_input(&usr);

uspace/app/getterm/Makefile

@@ -34 +34 @@
 SOURCES = \
         getterm.c \
-        version.c
+        version.c \
+        welcome.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/getterm/getterm.c

@@ -43 +43 @@
 #include <errno.h>
 #include "version.h"
+#include "welcome.h"
 
 #define APP_NAME  "getterm"
@@ -48 +49 @@
 static void usage(void)
 {
-        printf("Usage: %s <terminal> <path>\n", APP_NAME);
+        printf("Usage: %s <terminal> [-w] <command> [<arguments...>]\n", APP_NAME);
 }
 
@@ -73 +74 @@
 }
 
-static task_id_t spawn(const char *fname)
-{
-        task_id_t id;
-        int rc;
-        
-        rc = task_spawnl(&id, fname, fname, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", APP_NAME, fname,
-                    str_error(rc));
-                return 0;
-        }
-        
-        return id;
-}
-
 int main(int argc, char *argv[])
 {
-        if (argc < 3) {
+        int rc;
+        task_exit_t texit;
+        int retval;
+        task_id_t id;
+        char *fname, *term;
+        char **cmd_args;
+        bool print_wmsg;
+
+        argv++;
+        argc--;
+        if (argc < 1) {
                 usage();
                 return -1;
         }
+
+        if (str_cmp(*argv, "-w") == 0) {
+                print_wmsg = true;
+                argv++;
+                argc--;
+        } else {
+                print_wmsg = false;
+        }
+
+        if (argc < 2) {
+                usage();
+                return -1;
+        }
+
+        term = *argv++;
+        fname = *argv;
+        cmd_args = argv;
         
-        reopen(&stdin, 0, argv[1], O_RDONLY, "r");
-        reopen(&stdout, 1, argv[1], O_WRONLY, "w");
-        reopen(&stderr, 2, argv[1], O_WRONLY, "w");
+        reopen(&stdin, 0, term, O_RDONLY, "r");
+        reopen(&stdout, 1, term, O_WRONLY, "w");
+        reopen(&stderr, 2, term, O_WRONLY, "w");
         
         /*
@@ -114 +127 @@
                 return -4;
         
-        version_print(argv[1]);
-        task_id_t id = spawn(argv[2]);
-        
-        if (id != 0) {
-                task_exit_t texit;
-                int retval;
-                task_wait(id, &texit, &retval);
-                
-                return 0;
+        version_print(term);
+        if (print_wmsg)
+                welcome_msg_print();
+
+        rc = task_spawnv(&id, fname, (const char * const *) cmd_args);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s)\n", APP_NAME, fname,
+                    str_error(rc));
+                return -5;
         }
-        
-        return -5;
+
+        rc = task_wait(id, &texit, &retval);
+        if (rc != EOK) {
+                printf("%s: Error waiting for %s (%s)\n", APP_NAME, fname,
+                    str_error(rc));
+                return -6;
+        }
+
+        return 0;
 }
 

uspace/app/getterm/version.c

@@ -61 +61 @@
         printf("HelenOS release %s (%s)%s%s\n", release, name, revision, timestamp);
         printf("Running on %s (%s)\n", arch, term);
-        printf("Copyright (c) 2001-2009 HelenOS project\n\n");
+        printf("Copyright (c) 2001-2010 HelenOS project\n\n");
 }
 

uspace/app/init/init.c

@@ -185 +185 @@
         
         /* Wait for the input device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -200 +200 @@
 }
 
-static void getterm(const char *dev, const char *app)
+static void getterm(const char *dev, const char *app, bool wmsg)
 {
         char term[DEVMAP_NAME_MAXLEN];
@@ -210 +210 @@
         
         /* Wait for the terminal device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -218 +218 @@
         }
         
-        rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, term, app, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s %s (%s)\n", NAME,
-                    APP_GETTERM, term, app, str_error(rc));
+        if (wmsg) {
+                rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, "-w", term,
+                    app, NULL);
+                if (rc != EOK) {
+                        printf("%s: Error spawning %s -w %s %s (%s)\n", NAME,
+                            APP_GETTERM, term, app, str_error(rc));
+                }
+        } else {
+                rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, term, app,
+                    NULL);
+                if (rc != EOK) {
+                        printf("%s: Error spawning %s %s %s (%s)\n", NAME,
+                            APP_GETTERM, term, app, str_error(rc));
+                }
         }
 }
@@ -295 +305 @@
 #endif
         
-        getterm("term/vc0", "/app/bdsh");
-        getterm("term/vc1", "/app/bdsh");
-        getterm("term/vc2", "/app/bdsh");
-        getterm("term/vc3", "/app/bdsh");
-        getterm("term/vc4", "/app/bdsh");
-        getterm("term/vc5", "/app/bdsh");
-        getterm("term/vc6", "/app/klog");
+        getterm("term/vc0", "/app/bdsh", true);
+        getterm("term/vc1", "/app/bdsh", false);
+        getterm("term/vc2", "/app/bdsh", false);
+        getterm("term/vc3", "/app/bdsh", false);
+        getterm("term/vc4", "/app/bdsh", false);
+        getterm("term/vc5", "/app/bdsh", false);
+        getterm("term/vc6", "/app/klog", false);
         
         return 0;

uspace/app/mkfat/mkfat.c

@@ -85 +85 @@
     struct fat_params *par);
 static int fat_blocks_write(struct fat_params const *par,
-    dev_handle_t handle);
+    devmap_handle_t handle);
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
 
@@ -95 +95 @@
         int rc;
         char *dev_path;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         size_t block_size;
         char *endptr;
@@ -234 +234 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
+static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
 {
         aoff64_t addr;

uspace/app/netecho/netecho.c

@@ -173 +173 @@
                                 } else if (str_lcmp(argv[index] + 2, "count=", 6) == 0) {
                                         rc = arg_parse_int(argc, argv, &index, &count, 8);
+                                        if (rc != EOK)
+                                                return rc;
                                 } else if (str_lcmp(argv[index] + 2, "family=", 7) == 0) {
                                         rc = arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family);

uspace/app/nettest1/nettest1.c

@@ -287 +287 @@
 int main(int argc, char *argv[])
 {
-
-        socklen_t max_length;
-        uint8_t *address_data[sizeof(struct sockaddr_in6)];
-        struct sockaddr_in *address_in;
-        struct sockaddr_in6 *address_in6;
+        struct sockaddr_in address_in;
+        struct sockaddr_in6 address_in6;
         uint8_t *address_start;
 
@@ -300 +297 @@
 
         int rc;
-
-        max_length = sizeof(address_data);
-        address = (struct sockaddr *) address_data;
-        address_in = (struct sockaddr_in *) address;
-        address_in6 = (struct sockaddr_in6 *) address;
 
         sockets = 10;
@@ -334 +326 @@
 
         /* Prepare the address buffer */
-        bzero(address_data, max_length);
 
         switch (family) {
         case PF_INET:
-                address_in->sin_family = AF_INET;
-                address_in->sin_port = htons(port);
-                address_start = (uint8_t *) &address_in->sin_addr.s_addr;
-                addrlen = sizeof(struct sockaddr_in);
+                address_in.sin_family = AF_INET;
+                address_in.sin_port = htons(port);
+                address = (struct sockaddr *) &address_in;
+                addrlen = sizeof(address_in);
+                address_start = (uint8_t *) &address_in.sin_addr.s_addr;
                 break;
         case PF_INET6:
-                address_in6->sin6_family = AF_INET6;
-                address_in6->sin6_port = htons(port);
-                address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
-                addrlen = sizeof(struct sockaddr_in6);
+                address_in6.sin6_family = AF_INET6;
+                address_in6.sin6_port = htons(port);
+                address = (struct sockaddr *) &address_in6;
+                addrlen = sizeof(address_in6);
+                address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr;
                 break;
         default:

uspace/app/nettest2/nettest2.c

@@ -223 +223 @@
 int main(int argc, char *argv[])
 {
-        socklen_t max_length;
-        uint8_t address_data[sizeof(struct sockaddr_in6)];
         struct sockaddr *address;
-        struct sockaddr_in *address_in;
-        struct sockaddr_in6 *address_in6;
+        struct sockaddr_in address_in;
+        struct sockaddr_in6 address_in6;
         socklen_t addrlen;
         uint8_t *address_start;
@@ -247 +245 @@
         port = 7;
 
-        max_length = sizeof(address_data);
-        address = (struct sockaddr *) address_data;
-        address_in = (struct sockaddr_in *) address;
-        address_in6 = (struct sockaddr_in6 *) address;
-
         /*
          * Parse the command line arguments.
@@ -279 +272 @@
 
         /* Prepare the address buffer */
-        bzero(address_data, max_length);
 
         switch (family) {
         case PF_INET:
-                address_in->sin_family = AF_INET;
-                address_in->sin_port = htons(port);
-                address_start = (uint8_t *) &address_in->sin_addr.s_addr;
-                addrlen = sizeof(struct sockaddr_in);
+                address_in.sin_family = AF_INET;
+                address_in.sin_port = htons(port);
+                address = (struct sockaddr *) &address_in;
+                addrlen = sizeof(address_in);
+                address_start = (uint8_t *) &address_in.sin_addr.s_addr;
                 break;
         case PF_INET6:
-                address_in6->sin6_family = AF_INET6;
-                address_in6->sin6_port = htons(port);
-                address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
-                addrlen = sizeof(struct sockaddr_in6);
+                address_in6.sin6_family = AF_INET6;
+                address_in6.sin6_port = htons(port);
+                address = (struct sockaddr *) &address_in6;
+                addrlen = sizeof(address_in6);
+                address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr;
                 break;
         default:

uspace/app/test_serial/test_serial.c

@@ -69 +69 @@
         int res;
         res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
-        device_handle_t handle;
+        devman_handle_t handle;
         
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,