coreutils/src/ls.c, branch v7.2Mirror of https://https.git.savannah.gnu.org/git/coreutils.git/
https://git.shady.money/coreutils/atom?h=v7.22009-03-24T16:11:00Zls: make it possible to disable coloring of hard links2009-03-24T16:11:00ZKamil Dudkakdudka@redhat.com2009-03-24T11:16:20Zurn:sha1:2827bb5704a153a0b4ac9c4af8b83ed015012f68
* src/ls.c (print_color_indicator): Don't color hard links if disabled
(when there is an empty hl= in the LS_COLORS environment variable).
* tests/ls/hardlink: Add test case for disabled hard link highlighting.
* NEWS: Mention the change.
maint: avoid new unused-macro warnings from gcc2009-03-06T10:49:46ZJim Meyeringmeyering@redhat.com2009-03-06T09:49:18Zurn:sha1:8b638f994abefde84746b3d8a08893c9ffeb7799
* src/ls.c (ASSERT_MATCHING_DEV_INO): Comment-out unused definition,
to match commented-out use.
* src/install.c (INITIAL_HASH_MODULE, INITIAL_ENTRY_TAB_SIZE):
(READ_SIZE): Remove definitions of unused macros.
* src/mv.c (INITIAL_HASH_MODULE, INITIAL_ENTRY_TAB_SIZE): Likewise.
* src/dd.c (max): Likewise.
* src/expand.c (OUTPUT_BLOCK): Likewise.
* src/csplit.c (ALLOC_SIZE): Likewise.
* src/pr.c (NULLCOL): Likewise.
* src/ptx.c (Sword): Likewise.
* src/unexpand.c (OUTPUT_BLOCK): Likewise.
* src/factor.c (NDEBUG): Likewise.
doc: ls: clarify description of -s2009-02-20T18:32:02ZJim Meyeringmeyering@redhat.com2009-02-20T18:31:31Zurn:sha1:2061cd8aa64454d689a4de600aa515781cf346c2
* src/ls.c (usage): Make the description of -s mention "allocated size",
so that it's less likely to be confused with an apparent byte-count.
Suggested by Vito Caputo.
ls: clean up after wrapped+colored file names with clear-to-EOL2009-02-10T13:47:39ZJim Meyeringmeyering@redhat.com2008-12-31T18:17:31Zurn:sha1:adc62b5d9f3b4ab575c57b1b76eb6ad257a09f2c
This change addresses a relatively unusual case: ls --color, with
a highlighted name being printed initially in the last row of a
terminal emulator (possibly followed by other lines of output) such
that it is wrapped onto the following line, as the terminal emulator
scrolls the output. That would cause the entire following line to
be highlighted, even if the name happened to use only one position.
The least-invasive patch would have made colorized output larger for
all uses. The approach taken below is more invasive, but limits the
increase in overhead to only those lines that are expected to wrap.
* src/ls.c (enum indicator_no): Add C_CLR_TO_EOL.
(indicator_name): Add "cl".
(color_indicator): Add default escape codes for "cl".
(print_long_format): Propagate width to print_name_with_quoting.
(print_name_with_quoting): Print new C_CLR_TO_EOL string if needed.
Return the width of what we're printing.
(print_file_name_and_frills): Propagate width.
(print_type_indicator): Return bool (aka width).
(print_many_per_line): Pass column position to print_* function.
(print_current_files): Likewise.
(print_horizontal): Likewise.
(print_with_commas): Likewise.
* src/dircolors.c (slack_codes): Add "CLRTOEOL".
(ls_codes): Add "cl".
* tests/ls/color-clear-to-eol: New file. Test for this fix.
* tests/Makefile.am (TESTS): Add ls/color-clear-to-eol.
* THANKS: Update.
Reported by Alexander V. Lukyanov. See thread for details:
http://thread.gmane.org/gmane.linux.kernel/740021/focus=14824
Thanks to Jan Engelhardt for helping me reproduce the problem.
Demonstrate with this in an 80-column xterm:
seq 200 # to start in the "bottom" row
touch zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo
env LS_COLORS='*.foo=0;31;42' ls -og --color=always
Before the fix, you'd see something like this:
(where the file name is printed in red on a green background,
and each "=" denotes a space on a green background)
...
-rw-r--r-- 1 0 Feb 5 11:31 zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\
zzzzzzzzzzzzzz.foo===================================================
After the patch, the trailing green spaces are gone:
-rw-r--r-- 1 0 Feb 5 11:31 zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\
zzzzzzzzzzzzzz.foo
cleanup/modernize: don't test HAVE_MBRTOWC; now gnulib provides it2009-01-01T01:15:07ZJim Meyeringmeyering@redhat.com2008-12-23T18:06:31Zurn:sha1:92465d59c678c5a8e8c4c0985eb6ecec4c391df9
* bootstrap.conf (gnulib_modules): Include mbrtowc explicitly.
* src/ls.c (quote_name): Don't test HAVE_MBRTOWC, now that we're
guaranteed to have the function.
* src/wc.c (wc): Likewise.
avoid warnings about initialization of automatic aggregates2008-12-01T20:18:52ZJim Meyeringmeyering@redhat.com2008-11-30T21:37:42Zurn:sha1:c58b5daa337b16416be50adfeb3e99e3c009c891
* src/system.h (DZA_CONCAT0, DZA_CONCAT): New macros.
(DECLARE_ZEROED_AGGREGATE): New macro.
* src/ls.c (quote_name): Use it.
* src/pathchk.c (portable_chars_only): Use it.
* src/shred.c (main): Use it.
* src/stty.c (main): Use it.
* src/wc.c (SUPPORT_OLD_MBRTOWC): Use it.
make --help print "Report PROGRAM translation bugs to <...>."2008-11-10T07:19:52ZJim Meyeringmeyering@redhat.com2008-11-09T16:15:57Zurn:sha1:43448b049341d9b88293f38eb941759820f42e84
for all but the C/POSIX locale.
* src/system.h: Include "hard-locale.h".
(emit_bug_reporting_address): Tell where to report translation bugs.
don't include "hard-locale.h", now that system.h does
* src/comm.c: Likewise.
* src/join.c: Likewise.
* src/ls.c: Likewise.
* src/pinky.c: Likewise.
* src/pr.c: Likewise.
* src/sort.c: Likewise.
* src/uniq.c: Likewise.
* src/who.c: Likewise.
avoid warnings about discarding "qualifiers from pointer target type"2008-11-10T07:11:59ZJim Meyeringmeyering@redhat.com2008-10-28T21:06:44Zurn:sha1:854284f7887677395239c1085b27a09e834291b7
Use the new "bad_cast" function or an actual cast-to-"(char *)"
to avoid warnings.
* src/system.h (bad_cast): Define.
* src/chown.c (main):
* src/chroot.c (main):
* src/date.c (main):
* src/du.c (main):
* src/expand.c (stdin_argv):
* src/ls.c (decode_switches):
* src/md5sum.c (main):
* src/paste.c (main):
* src/pr.c (col_sep_string, column_separator, line_separator, main):
* src/sort.c (main):
* src/split.c (main):
* src/tail.c (main):
* src/unexpand.c (stdin_argv):
* src/yes.c (main):
ls: --color now highlights hard linked files, too2008-10-28T20:08:30ZKamil Dudkakdudka@redhat.com2008-10-27T14:38:23Zurn:sha1:1e48b1fee5fa2ad2d1802771eafbfcddb38a24cb
* src/ls.c (print_color_indicator): Colorize hard linked files.
* src/dircolors.c: Add color for hard link.
* src/dircolors.hin: Add color for hard link.
* tests/ls/hardlink: Test for ls - colorize hard linked files.
* tests/Makefile.am (TESTS): Add ls/hardlink.
* NEWS: Mention the change.
ls: use '.' (not +) as SELinux-only alt. access flag in ls -l output2008-10-23T12:18:25ZJim Meyeringmeyering@redhat.com2008-04-02T20:26:45Zurn:sha1:b3677e5e383103bf1764b2c8a9329b1c17934b24
* src/ls.c (gobble_file) [long_format]: Map SELinux-only to '.',
any other nonempty combination of MAC and ACL to '+', and all else
to the usual ' '. Suggested by Michael Stone.
* tests/misc/selinux: Adapt: expect '.', not '+'.
* doc/coreutils.texi (What information is listed): Document this.
* NEWS (Changes in behavior): Mention it.