From 0df338f6719ec2bcf1e1dea2d8b12dc66daf8a1e Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 10 Jun 2009 19:44:43 +0200 Subject: ls --color: do not colorize files with multiple hard links by default * src/ls.c: Rename hl->mh, do not colorize files with multiple hard links by default. * src/dircolors.c: Rename HARDLINK -> MULTIHARDLINK, hl -> mh. * src/dircolors.hin: Do not colorize files with multiple hard links by default. * tests/Makefile.am: Rename the test case accordingly. * tests/ls/multihardlink: Additionally test ls' default behavior and factor out some duplication. * NEWS: Mention the change in behavior. --- tests/ls/hardlink | 60 ---------------------------------------- tests/ls/multihardlink | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 60 deletions(-) delete mode 100755 tests/ls/hardlink create mode 100755 tests/ls/multihardlink (limited to 'tests/ls') diff --git a/tests/ls/hardlink b/tests/ls/hardlink deleted file mode 100755 index b12091466..000000000 --- a/tests/ls/hardlink +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# Ensure "ls --color" properly colorizes hard linked files. - -# Copyright (C) 2008 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 . - -if test "$VERBOSE" = yes; then - set -x - ls --version -fi - -. $srcdir/test-lib.sh -working_umask_or_skip_ - -touch file file1 || framework_failure -ln file1 file2 || skip_test_ "can't create hard link" -code_hl='44;37' -code_png='01;35' -fail=0 - -# regular file - not hard linked -LS_COLORS="hl=$code_hl" ls -U1 --color=always file > out || fail=1 -printf "file\n" > out_ok || fail=1 -compare out out_ok || fail=1 - -# hard links -LS_COLORS="hl=$code_hl" ls -U1 --color=always file1 file2 > out || fail=1 -printf "\033[0m\033[44;37mfile1\033[0m -\033[44;37mfile2\033[0m -\033[m" > out_ok || fail=1 -compare out out_ok || fail=1 - -# hard links and png -mv file2 file2.png || framework_failure -LS_COLORS="hl=$code_hl:*.png=$code_png" ls -U1 --color=always file1 file2.png > out || fail=1 -printf "\033[0m\033[44;37mfile1\033[0m -\033[44;37mfile2.png\033[0m -\033[m" > out_ok || fail=1 -compare out out_ok || fail=1 - -# hard links and png (hard links highlighting disabled) -LS_COLORS="hl=:*.png=$code_png" ls -U1 --color=always file1 file2.png > out || fail=1 -printf "file1 -\033[0m\033[01;35mfile2.png\033[0m -\033[m" > out_ok || fail=1 -compare out out_ok || fail=1 - -Exit $fail diff --git a/tests/ls/multihardlink b/tests/ls/multihardlink new file mode 100755 index 000000000..d237a71a9 --- /dev/null +++ b/tests/ls/multihardlink @@ -0,0 +1,74 @@ +#!/bin/sh +# Ensure "ls --color" properly colorizes hard linked files. + +# Copyright (C) 2008-2009 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 . + +if test "$VERBOSE" = yes; then + set -x + ls --version +fi + +. $srcdir/test-lib.sh +working_umask_or_skip_ + +touch file file1 || framework_failure +ln file1 file2 || skip_test_ "can't create hard link" +code_mh='44;37' +code_png='01;35' +c0=$(printf '\033[0m') +c_end=$(printf '\033[m') +c_mh=$(printf '\033[%sm' $code_mh) +c_png=$(printf '\033[%sm' $code_png) +fail=0 + +# regular file - not hard linked +LS_COLORS="mh=$code_mh" ls -U1 --color=always file > out || fail=1 +printf "file\n" > out_ok || framework_failure +compare out out_ok || fail=1 + +# hard links +LS_COLORS="mh=$code_mh" ls -U1 --color=always file1 file2 > out || fail=1 +printf "$c0${c_mh}file1$c0 +${c_mh}file2$c0 +$c_end" > out_ok || framework_failure +compare out out_ok || fail=1 + +# hard links and png (hard link coloring takes precedence) +mv file2 file2.png || framework_failure +LS_COLORS="mh=$code_mh:*.png=$code_png" ls -U1 --color=always file1 file2.png \ + > out || fail=1 +printf "$c0${c_mh}file1$c0 +${c_mh}file2.png$c0 +$c_end" > out_ok || framework_failure +compare out out_ok || fail=1 + +# hard links and png (hard link coloring disabled => png coloring enabled) +LS_COLORS="mh=00:*.png=$code_png" ls -U1 --color=always file1 file2.png > out \ + || fail=1 +printf "file1 +$c0${c_png}file2.png$c0 +$c_end" > out_ok || framework_failure +compare out out_ok || fail=1 + +# hard links and png (hard link coloring not enabled explicitly => png coloring) +LS_COLORS="*.png=$code_png" ls -U1 --color=always file1 file2.png > out \ + || fail=1 +printf "file1 +$c0${c_png}file2.png$c0 +$c_end" > out_ok || framework_failure +compare out out_ok || fail=1 + +Exit $fail -- cgit v1.2.3-54-g00ecf