testsuite-discovered fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-25 02:00:16 +01:00
parent 2315c8854c
commit 307b24c851
3 changed files with 8 additions and 6 deletions

View File

@ -203,11 +203,13 @@ size_t FAST_FUNC mbstowcs(wchar_t *dest, const char *src, size_t n)
while (n) {
wchar_t wc;
const char *rc = mbstowc_internal(dest ? dest : &wc, src);
if (rc == NULL) /* error */
src = mbstowc_internal(&wc, src);
if (src == NULL) /* error */
return (size_t) -1L;
if (dest)
dest++;
*dest++ = wc;
if (wc == 0) /* end-of-string */
break;
n--;
}

View File

@ -126,4 +126,4 @@ test x"$res" = xOK
# This should error out (by showing usage text). Testing for that
dt=`busybox date -d 012311332000.30 %+c 2>&1 | head -n 1`
test x"${dt#BusyBox * multi-call binary}" = x
test x"${dt##BusyBox * multi-call binary*}" = x""

View File

@ -7,9 +7,9 @@
# ls -ln is showing date. Need to remove that, it's variable
# sed: (1) "maj, min" -> "maj,min" (2) coalesce spaces
# cut: remove date
FILTER_LS="sed -e 's/, */,/g' -e 's/ */ /g' | cut -d' ' -f 1-5,9-"
FILTER_LS="grep -v '^total ' | sed -e 's/, */,/g' -e 's/ */ /g' | cut -d' ' -f 1-5,9-"
# cut: remove size+date
FILTER_LS2="sed -e 's/, */,/g' -e 's/ */ /g' | cut -d' ' -f 1-4,9-"
FILTER_LS2="grep -v '^total ' | sed -e 's/, */,/g' -e 's/ */ /g' | cut -d' ' -f 1-4,9-"
# testing "test name" "options" "expected result" "file input" "stdin"