Index: uspace/app/bdsh/cmds/builtins/builtins.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/builtins.h	(revision 9a25aebc09d02d946488276e282568faebf3b7ae)
+++ uspace/app/bdsh/cmds/builtins/builtins.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
@@ -10,5 +10,5 @@
 #include "cd/cd_def.h"
 #include "exit/exit_def.h"
-	{NULL, NULL, NULL, NULL}
+	{NULL, NULL, NULL, NULL, NULL}
 };
 
Index: uspace/app/bdsh/cmds/builtins/cd/cd_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision 9a25aebc09d02d946488276e282568faebf3b7ae)
+++ uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
@@ -4,3 +4,4 @@
 	&cmd_cd,
 	&help_cmd_cd,
+	0
 },
Index: uspace/app/bdsh/cmds/builtins/exit/exit_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision 9a25aebc09d02d946488276e282568faebf3b7ae)
+++ uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
@@ -4,3 +4,4 @@
 	&cmd_exit,
 	&help_cmd_exit,
+	0
 },
Index: uspace/app/bdsh/input.c
===================================================================
--- uspace/app/bdsh/input.c	(revision 9a25aebc09d02d946488276e282568faebf3b7ae)
+++ uspace/app/bdsh/input.c	(revision e2ae2fcdf054f0d01d0003941810f8b4544fb596)
@@ -508,5 +508,4 @@
 {
 	int sa, sb;
-	wchar_t tmp_c;
 	char *str;
 
@@ -514,13 +513,11 @@
 
 	if (sb < ti->nc) {
-		tmp_c = ti->buffer[sb];
+		wchar_t tmp_c = ti->buffer[sb];
 		ti->buffer[sb] = '\0';
-	}
-
-	str = wstr_to_astr(ti->buffer + sa);
-
-	if (sb < ti->nc)
+		str = wstr_to_astr(ti->buffer + sa);
 		ti->buffer[sb] = tmp_c;
-
+	} else
+		str = wstr_to_astr(ti->buffer + sa);
+	
 	if (str == NULL)
 		goto error;