Changeset a6480d5 in mainline

Timestamp:

2011-08-21T11:44:59Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

25c1b2c, bd5f3b7, d1e196f7

Parents:

c22531fc (diff), 1877128 (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.

git-author:

Martin Sucha <> (2011-08-21 11:44:59)

git-committer:

Martin Decky <martin@…> (2011-08-21 11:44:59)

Message:

merge Martin Sucha's fixes and improvements

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)
• app/bdsh/compl.c (modified) (6 diffs)
• app/bdsh/input.c (modified) (3 diffs)
• app/tester/stdio/stdio1.c (modified) (1 diff)
• dist/src/sysel/demos/htxtfile.sy (modified) (1 diff)
• dist/textdemo (moved) (moved from uspace/dist/readme )
• 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

@@ -163 +163 @@
         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/app/bdsh/compl.c

@@ -99 +99 @@
         tokenizer_t tok;
         token_t tokens[WORD_MAX];
-        unsigned int current_token;
+        int current_token;
         size_t tokens_length;
 
@@ -127 +127 @@
         
         /* Find the current token */
-        for (current_token = 0; current_token < tokens_length; current_token++) {
+        for (current_token = 0; current_token < (int) tokens_length;
+            current_token++) {
                 token_t *t = &tokens[current_token];
                 size_t end = t->char_start + t->char_length;
@@ -137 +138 @@
                 }
         }
-        
-        if (tokens[current_token].type != TOKTYPE_SPACE) {
+        if (tokens_length == 0) current_token = -1;
+        
+        if (current_token >= 0 && tokens[current_token].type != TOKTYPE_SPACE) {
                 *cstart = tokens[current_token].char_start;
         }
@@ -154 +156 @@
                 goto error;
         }
-
-        str_ncpy(prefix, pref_size + 1, stext +
-            tokens[current_token].byte_start, pref_size);
+        prefix[pref_size] = 0;
+
+        if (current_token >= 0) {
+                str_ncpy(prefix, pref_size + 1, stext +
+                    tokens[current_token].byte_start, pref_size);
+        }
 
         /*
@@ -166 +171 @@
         /* Skip any whitespace before current token */
         int prev_token = current_token - 1;
-        if (prev_token != -1 && tokens[prev_token].type == TOKTYPE_SPACE) {
+        if (prev_token >= 0 && tokens[prev_token].type == TOKTYPE_SPACE) {
                 prev_token--;
         }
@@ -174 +179 @@
          * follows a pipe token.
          */
-        if (prev_token == -1 || tokens[prev_token].type == TOKTYPE_SPACE)
+        if (prev_token < 0 || tokens[prev_token].type == TOKTYPE_SPACE)
                 cs->is_command = true;
         else

uspace/app/bdsh/input.c

@@ -68 +68 @@
 {
         char *cmd[WORD_MAX];
-        token_t tokens_space[WORD_MAX];
-        token_t *tokens = tokens_space;
+        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens == NULL)
+                return ENOMEM;
         int rc = 0;
         tokenizer_t tok;
@@ -77 +78 @@
         char *redir_to = NULL;
 
-        if (NULL == usr->line)
+        if (NULL == usr->line) {
+                free(tokens);
                 return CL_EFAIL;
+        }
 
         rc = tok_init(&tok, usr->line, tokens, WORD_MAX);
@@ -209 +212 @@
         }
         tok_fini(&tok);
+        free(tokens);
 
         return rc;

uspace/app/tester/stdio/stdio1.c

@@ -39 +39 @@
 {
         FILE *file;
-        const char *file_name = "/readme";
+        const char *file_name = "/textdemo";
         
         TPRINTF("Open file \"%s\"...", file_name);

uspace/dist/src/sysel/demos/htxtfile.sy

@@ -35 +35 @@
                 var out_file : TextFile;
 
-                name = "/readme";
+                name = "/textdemo";
 
                 in_file = new TextFile();

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);