Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 827d73f in mainline for uspace/app/bdsh/input.c


Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (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:

Merged the actual head

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/input.c

    r918e9910 r827d73f  
    508508{
    509509        int sa, sb;
    510         wchar_t tmp_c;
    511510        char *str;
    512511
     
    514513
    515514        if (sb < ti->nc) {
    516                 tmp_c = ti->buffer[sb];
     515                wchar_t tmp_c = ti->buffer[sb];
    517516                ti->buffer[sb] = '\0';
    518         }
    519 
    520         str = wstr_to_astr(ti->buffer + sa);
    521 
    522         if (sb < ti->nc)
     517                str = wstr_to_astr(ti->buffer + sa);
    523518                ti->buffer[sb] = tmp_c;
    524 
     519        } else
     520                str = wstr_to_astr(ti->buffer + sa);
     521       
    525522        if (str == NULL)
    526523                goto error;
Note: See TracChangeset for help on using the changeset viewer.