Changeset ec7f8b1 in mainline for uspace/app/bdsh/cmds/modules/help/help.c

Timestamp:

2011-08-21T15:35:03Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

bb74dabe

Parents:

c4a8e4a (diff), 5935c079 (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.

File:

• uspace/app/bdsh/cmds/modules/help/help.c (modified) (3 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Tim Post
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -30 +31 @@
 #include <stdlib.h>
 #include <str.h>
+#include <fmtutil.h>
 
 #include "config.h"
@@ -128 +130 @@
 static void help_survival(void)
 {
-        printf("Don't panic!\n\n");
-
-        printf("This is Bdsh, the Brain dead shell, currently "
+        print_wrapped_console(
+            "Don't panic!\n\n"
+
+            "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 "
+            "Ctrl-V), similar to common desktop environments.\n\n"
+
+            "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. "
+            "by entering its name (e.g. type 'tetris' [Enter]).\n\n"
+
+            "HelenOS has virtual consoles (VCs). You can switch between "
+            "these using the F1-F11 keys.\n\n"
+
+            "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");
+            "Guide: http://trac.helenos.org/wiki/UsersGuide\n\n",
+            ALIGN_LEFT);
 }