Changeset 371bd7d in mainline for uspace/app/bdsh/input.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/input.c (modified) (3 diffs)

uspace/app/bdsh/input.c

@@ -32 +32 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>
@@ -508 +508 @@
 {
         int sa, sb;
-        wchar_t tmp_c;
         char *str;
 
@@ -514 +513 @@
 
         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;