Index: uspace/app/bdsh/cmds/modules/help/help.c =================================================================== --- uspace/app/bdsh/cmds/modules/help/help.c (revision d52b00441cdabb1adcf0ee99c91a56217e472cd0) +++ uspace/app/bdsh/cmds/modules/help/help.c (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -45,7 +45,8 @@ 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,4 +56,7 @@ { int rc = HELP_IS_RUBBISH; + + if (str_cmp(cmd, "commands") == 0) + return HELP_IS_COMMANDS; rc = is_builtin(cmd); @@ -90,44 +94,11 @@ } -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,4 +125,73 @@ 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; Index: uspace/app/bdsh/scli.c =================================================================== --- uspace/app/bdsh/scli.c (revision d52b00441cdabb1adcf0ee99c91a56217e472cd0) +++ uspace/app/bdsh/scli.c (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -89,7 +89,4 @@ 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); Index: uspace/app/getterm/Makefile =================================================================== --- uspace/app/getterm/Makefile (revision d52b00441cdabb1adcf0ee99c91a56217e472cd0) +++ uspace/app/getterm/Makefile (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -34,5 +34,6 @@ SOURCES = \ getterm.c \ - version.c + version.c \ + welcome.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/getterm/getterm.c =================================================================== --- uspace/app/getterm/getterm.c (revision d52b00441cdabb1adcf0ee99c91a56217e472cd0) +++ uspace/app/getterm/getterm.c (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -43,4 +43,5 @@ #include #include "version.h" +#include "welcome.h" #define APP_NAME "getterm" @@ -48,5 +49,5 @@ static void usage(void) { - printf("Usage: %s []\n", APP_NAME); + printf("Usage: %s [-w] []\n", APP_NAME); } @@ -79,14 +80,33 @@ int retval; task_id_t id; - char *fname; + char *fname, *term; + char **cmd_args; + bool print_wmsg; - if (argc < 3) { + ++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"); /* @@ -105,8 +125,9 @@ return -4; - version_print(argv[1]); - fname = argv[2]; - - rc = task_spawnv(&id, fname, (const char * const *) &argv[2]); + 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, Index: uspace/app/getterm/welcome.c =================================================================== --- uspace/app/getterm/welcome.c (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) +++ uspace/app/getterm/welcome.c (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup getterm + * @{ + */ +/** + * @file + */ + +#include +#include "welcome.h" + +/** Welcome message and survival tips. */ +void welcome_msg_print(void) +{ + printf("Welcome to HelenOS!\n"); + printf("http://www.helenos.org/\n\n"); + printf("Type 'help' [Enter] to see a few survival tips.\n\n"); +} + +/** @} + */ Index: uspace/app/getterm/welcome.h =================================================================== --- uspace/app/getterm/welcome.h (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) +++ uspace/app/getterm/welcome.h (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup getterm + * @{ + */ +/** + * @file + */ + +#ifndef WELCOME_H__ +#define WELCOME_H__ + +extern void welcome_msg_print(void); + +#endif + +/** @} + */ Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision d52b00441cdabb1adcf0ee99c91a56217e472cd0) +++ uspace/app/init/init.c (revision 4deb8b5597965bf2e7cb822f07fab72960edddfa) @@ -200,5 +200,5 @@ } -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]; @@ -218,8 +218,18 @@ } - 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,11 +305,11 @@ #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;