On 20/10/15 03:55, Aaron Davies wrote: > On Aug 24, 2015, at 3:34 AM, f0rhum <f0r...@free.fr> wrote: >> >> Le 23/08/2015 23:11, Stephane Chazelas a écrit : >> >>> 2015-08-23 13:26:35 +0200, Erik Auerswald: >>>> Hi, >>>> >>>> On Sat, Aug 22, 2015 at 08:58:01PM -0700, Paul Eggert wrote: >>>>> Pádraig Brady wrote: >>>>>> Also base64 -w0 has similar meaning. >>>>> I didn't know that, but I don't like that either. Utilities should >>>>> use an explicit representation for infinity, if that's what they >>>>> need. 'Inf', say. >>>>> >>>>> In the meantime, the patch that I installed is helpful even if we >>>>> later add an explicit representation of infinity. >>>> Using 0 to disable a length or width limit is quite common with networking >>>> gear. I do not know any example requiring a keyword like "Inf", neither >>>> UNIX (like) nor other CLIs. >>> [...] >>> >>> Anything using strtod() to parse numbers should understand inf >>> or infinity (with any vAriATion on the case). >>> >>> That's the case of GNU sleep for instance. >>> >>> That doesn't apply to integers though. >> >> I'm not involved, but just a suggestion if no one thought about this: why >> not use w-1 ? > > here's some more precedent for 0 meaning infinity; from `info sed': > >> `-l N' >> `--line-length=N' >> Specify the default line-wrap length for the `l' command. A >> length of 0 (zero) means to never wrap long lines. If not >> specified, it is taken to be 70.
Right. It comes down to whether the number is considered as a length/width or a limit. If a limit, then 0 naturally implies no limit. If a length, then 0 is meaningless. So in cases where the output can be optionally wrapped, IMHO it makes sense to consider 0 as a limit. I like Bernhard's suggestion of just using `paste -s -d' '`, however that single spaces items, whereas ls double spaces (to aid parsing of names with spaces I suppose). BTW I see the change to allow -w999... also allowed 0, which results in division by zero later on: $ src/ls -w0 --color=always Floating point exception (core dumped) The attached fixes that and makes -w0 behave as described above, while operating more efficiently in this mode. cheers, Pádraig.
From 3f676e249d23593fbca7c6a4ebca0c4bbda67669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <p...@draigbrady.com> Date: Tue, 20 Oct 2015 14:42:39 +0100 Subject: [PATCH] ls: allow -w0 to mean no limit on line length * src/ls.c (set_line_length): Have -w0 imply -w$SIZE_MAX. (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 --- NEWS | 2 ++ doc/coreutils.texi | 4 +++- src/ls.c | 33 +++++++++++++++++++++++---------- tests/local.mk | 1 + tests/ls/w-option.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 11 deletions(-) create mode 100755 tests/ls/w-option.sh diff --git a/NEWS b/NEWS index 80f99f3..07b88b0 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,8 @@ GNU coreutils NEWS -*- outline -*- upon detection of a directory cycle. [issue introduced in coreutils-8.20] + ls -w0 is now interpreted as no limit on the length of the outputted line. + * Noteworthy changes in release 8.24 (2015-07-03) [stable] diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 0359867..1b81daa 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -7445,7 +7445,9 @@ TAB following a non-ASCII byte. You can avoid that issue by using the Assume the screen is @var{cols} columns wide. The default is taken from the terminal settings if possible; otherwise the environment variable @env{COLUMNS} is used if it is set; otherwise the default -is 80. +is 80. With a @var{cols} value of @samp{0}, there is no limit on +the length of the output line, and that single output line will +be delimited with spaces, not tabs. @end table diff --git a/src/ls.c b/src/ls.c index 3822534..f2118fe 100644 --- a/src/ls.c +++ b/src/ls.c @@ -279,7 +279,7 @@ static size_t print_name_with_quoting (const struct fileinfo *f, static void prep_non_filename_text (void); static bool print_type_indicator (bool stat_ok, mode_t mode, enum filetype type); -static void print_with_commas (void); +static void print_with_separator (char sep); static void queue_directory (char const *name, char const *realname, bool command_line_arg); static void sort_files (void); @@ -1537,6 +1537,8 @@ set_line_length (char const *spec) { case LONGINT_OK: line_length = MIN (val, SIZE_MAX); + if (line_length == 0) /* No limit. */ + line_length = SIZE_MAX; return true; case LONGINT_OVERFLOW: @@ -3647,15 +3649,21 @@ print_current_files (void) break; case many_per_line: - print_many_per_line (); + if (line_length == SIZE_MAX) + print_with_separator (' '); + else + print_many_per_line (); break; case horizontal: - print_horizontal (); + if (line_length == SIZE_MAX) + print_with_separator (' '); + else + print_horizontal (); break; case with_commas: - print_with_commas (); + print_with_separator (','); break; case long_format: @@ -4583,24 +4591,29 @@ print_horizontal (void) putchar ('\n'); } +/* Output name + SEP + ' '. */ + static void -print_with_commas (void) +print_with_separator (char sep) { size_t filesno; size_t pos = 0; + size_t pos_inc = line_length == SIZE_MAX ? 0 : 2; for (filesno = 0; filesno < cwd_n_used; filesno++) { struct fileinfo const *f = sorted_file[filesno]; - size_t len = length_of_file_name_and_frills (f); + size_t len = line_length == SIZE_MAX + ? 0 : length_of_file_name_and_frills (f); if (filesno != 0) { char separator; - if (pos + len + 2 < line_length) + if ((pos + len + pos_inc < line_length) + && (pos < SIZE_MAX - len - pos_inc)) { - pos += 2; + pos += pos_inc; separator = ' '; } else @@ -4609,7 +4622,7 @@ print_with_commas (void) separator = '\n'; } - putchar (','); + putchar (sep); putchar (separator); } @@ -4935,7 +4948,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ -v natural sort of (version) numbers within text\n\ "), stdout); fputs (_("\ - -w, --width=COLS assume screen width instead of current value\n\ + -w, --width=COLS set output width to COLS. 0 means no limit\n\ -x list entries by lines instead of by columns\n\ -X sort alphabetically by entry extension\n\ -Z, --context print any security context of each file\n\ diff --git a/tests/local.mk b/tests/local.mk index 0471f5e..ee4068d 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 0000000..df9a9aa --- /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 implies a default TABSIZE of 0 +TABSIZE=1 ls -w0 -x 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 -- 2.5.0
