Changes in / [8a6ba94:f90eb75] in mainline

Location:

uspace

Files:

• app/bdsh/Makefile (modified) (1 diff)
• app/bdsh/cmds/modules/help/help.c (modified) (1 diff)
• app/bdsh/input.c (modified) (2 diffs)
• lib/c/generic/str.c (modified) (1 diff)

uspace/app/bdsh/Makefile

@@ -31 +31 @@
 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
+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

@@ -152 +152 @@
             "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);
 }

uspace/app/bdsh/input.c

@@ -67 +67 @@
 int process_input(cliuser_t *usr)
 {
-        char *cmd[WORD_MAX];
         token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
         if (tokens == NULL)
                 return ENOMEM;
+        
+        char *cmd[WORD_MAX];
         int rc = 0;
         tokenizer_t tok;
@@ -78 +79 @@
         char *redir_to = NULL;
 
-        if (NULL == usr->line) {
+        if (usr->line == NULL) {
                 free(tokens);
                 return CL_EFAIL;

uspace/lib/c/generic/str.c

@@ -731 +731 @@
 {
         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);
+        
+        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
+        if (wstr == NULL)
+                return NULL;
+        
+        str_to_wstr(wstr, len + 1, str);
         return wstr;
 }