aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2017-03-20 13:14:14 -0500
committerRob Landley <rob@landley.net>2017-03-20 13:14:14 -0500
commit47d07dc1554348b3b3a920627a538bd7164aeb8e (patch)
tree77d4d31634b93a063e6da99fd3fc1085a3c36ca7
parentcb8e5ad6c5b9c79cce1a6baf10041f90cf491711 (diff)
downloadtoybox-47d07dc1554348b3b3a920627a538bd7164aeb8e.tar.gz
Paste bugfix, more tests.
-rwxr-xr-xtests/paste.test12
-rw-r--r--toys/posix/paste.c1
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/paste.test b/tests/paste.test
index a6486189..c067f182 100755
--- a/tests/paste.test
+++ b/tests/paste.test
@@ -15,4 +15,16 @@ testing "" "paste -s three four" "\n\n" "" ""
testing "" "paste three four" "" "" ""
testing "" "paste - - -" "uno\tdos\tdesqview\nunix\t\t\n" "" "uno\ndos\ndesqview\nunix\n"
testing "" "paste - - - -d ''" "unodosdesqview\nunix\n" "" "uno\ndos\ndesqview\nunix\n"
+testing "" "paste one two one two" \
+ "one1\ttwo1\tone1\ttwo1\none2\ttwo2\tone2\ttwo2\none3\ttwo3\tone3\ttwo3\n" \
+ "" ""
+testing "" "paste five three two" "five\t\ttwo1\n\t\ttwo2\n\t\ttwo3\n" "" ""
+testing "" "paste -d '私\0${UTFTEST}q' - - - - - - " \
+ "one私twothree${UTFTEST}fourqfive私six\n7私89${UTFTEST}q私\n" \
+ "" "one\ntwo\nthree\nfour\nfive\nsix\n7\n8\n9\n"
rm -f one two three four
+unset UTFTEST
+
+# test -d \n
+# test -d \x
+# test
diff --git a/toys/posix/paste.c b/toys/posix/paste.c
index 508b3518..42e6a287 100644
--- a/toys/posix/paste.c
+++ b/toys/posix/paste.c
@@ -83,7 +83,6 @@ static void paste_files(void)
dpos++;
}
}
- dpos++;
} else {
while (0<(dlen = mbtowc(&wc, dpos, 99))) {
dpos += dlen;