summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2015-10-20 14:42:39 +0100
committerPádraig Brady <P@draigBrady.com>2015-10-21 01:40:02 +0100
commit0e997681d4497fe9ba6db035909e413a5af050a9 (patch)
tree3a6e4bbf904902dbb71124567942198e3142147a /tests
parent069961924efb64349914df085d6b0ac76bdaf7ae (diff)
downloadcoreutils-0e997681d4497fe9ba6db035909e413a5af050a9.tar.xz
ls: allow -w0 to mean no limit on line length
* src/ls.c (print_with_separator): Renamed from print_with_commas, and parameterized to accept the separator to print. Also fix an edge case where '\n' not printed when the POS variable overflows SIZE_MAX. (print_current_files): Degenerate -x and -C to using the cheaper print_with_separator() in the -w0 case. * doc/coreutils.texi (ls invocation): Document the new feature. * tests/ls/w-option.sh: A new test. * tests/local.mk: Reference the new test. * NEWS: Mention the improvement. Fixes http://bugs.gnu.org/21325
Diffstat (limited to 'tests')
-rw-r--r--tests/local.mk1
-rwxr-xr-xtests/ls/w-option.sh44
2 files changed, 45 insertions, 0 deletions
diff --git a/tests/local.mk b/tests/local.mk
index 0471f5e4e..ee4068d64 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -568,6 +568,7 @@ all_tests = \
tests/ls/infloop.sh \
tests/ls/inode.sh \
tests/ls/m-option.sh \
+ tests/ls/w-option.sh \
tests/ls/multihardlink.sh \
tests/ls/no-arg.sh \
tests/ls/no-cap.sh \
diff --git a/tests/ls/w-option.sh b/tests/ls/w-option.sh
new file mode 100755
index 000000000..f49c02815
--- /dev/null
+++ b/tests/ls/w-option.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# exercise the -w option
+
+# Copyright (C) 2015 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ ls
+getlimits_
+
+touch a b || framework_failure_
+chmod a+x a || framework_failure_
+
+# Negative values disallowed
+returns_ 2 ls -w-1 || fail=1
+
+# Verify octal parsing (especially since 0 is allowed)
+returns_ 2 ls -w08 || fail=1
+
+# Overflowed values are capped at SIZE_MAX
+ls -w$SIZE_OFLOW || fail=1
+
+# After coreutils 8.24 -w0 means no limit
+# and delimiting with spaces
+ls -w0 -x -T1 a b > out || fail=1
+printf '%s\n' 'a b' > exp || framework_failure_
+compare exp out || fail=1
+
+# Ensure that 0 line length doesn't cause division by zero
+TERM=xterm ls -w0 -x --color=always || fail=1
+
+Exit $fail