Changeset 22cf42d9 in mainline

Timestamp:

2011-08-20T22:58:14Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

e406736

Parents:

f41682c

Message:

Add formatting library and display help message wrapped

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (1 diff)
• app/bdsh/Makefile (modified) (1 diff)
• app/bdsh/cmds/modules/help/help.c (modified) (3 diffs)
• lib/c/generic/str.c (modified) (2 diffs)
• lib/c/include/str.h (modified) (1 diff)
• lib/fmtutil/Makefile (added)
• lib/fmtutil/fmtutil.c (added)
• lib/fmtutil/fmtutil.h (added)

uspace/Makefile

@@ -162 +162 @@
         lib/block \
         lib/clui \
+        lib/fmtutil \
         lib/scsi \
         lib/softint \

uspace/Makefile.common

@@ -108 +108 @@
 LIBIMGMAP_PREFIX = $(LIB_PREFIX)/imgmap
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
+LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
 
 LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2

uspace/app/bdsh/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) -I. -Icmds/ \
-        -Icmds/builtins -Icmds/modules
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a \
+        $(LIBFMTUTIL_PREFIX)/libfmtutil.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) -I$(LIBFMTUTIL_PREFIX)\
+        -I. -Icmds/ -Icmds/builtins -Icmds/modules
 BINARY = bdsh
 

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/trac.fcgi/wiki/UsersGuide\n\n",
+             ALIGN_LEFT);
 }
 

uspace/lib/c/generic/str.c

@@ -2 +2 @@
  * Copyright (c) 2005 Martin Decky
  * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -718 +719 @@
 
         dest[dlen - 1] = '\0';
+}
+
+/** Convert string to wide string.
+ *
+ * Convert string @a src to wide string. A new wide NULL-terminated
+ * string will be allocated on the heap.
+ *
+ * @param src   Source string.
+ */
+wchar_t *str_to_awstr(const char *str)
+{
+        size_t len = str_length(str);
+        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
+        if (wstr == NULL) {
+                return NULL;
+        }
+        str_to_wstr(wstr, len+1, str);
+        return wstr;
 }
 

uspace/lib/c/include/str.h

@@ -83 +83 @@
 extern char *wstr_to_astr(const wchar_t *src);
 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
+extern wchar_t *str_to_awstr(const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);