diff options
| author | Kamil Dudka <kdudka@redhat.com> | 2009-06-10 19:44:43 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-06-11 09:53:50 +0200 |
| commit | 0df338f6719ec2bcf1e1dea2d8b12dc66daf8a1e (patch) | |
| tree | 4c77cf9c92a258da00f48e002142e9e4946d7bc1 /src/ls.c | |
| parent | 502be19e0fdb52dbc76fe95d5a4966ef0b06f3dc (diff) | |
| download | coreutils-0df338f6719ec2bcf1e1dea2d8b12dc66daf8a1e.tar.xz | |
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.
Diffstat (limited to 'src/ls.c')
| -rw-r--r-- | src/ls.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -529,7 +529,7 @@ enum indicator_no C_LEFT, C_RIGHT, C_END, C_RESET, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK, C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR, C_SETUID, C_SETGID, - C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE, C_CAP, C_HARDLINK, + C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE, C_CAP, C_MULTIHARDLINK, C_CLR_TO_EOL }; @@ -537,7 +537,7 @@ static const char *const indicator_name[]= { "lc", "rc", "ec", "rs", "no", "fi", "di", "ln", "pi", "so", "bd", "cd", "mi", "or", "ex", "do", "su", "sg", "st", - "ow", "tw", "ca", "hl", "cl", NULL + "ow", "tw", "ca", "mh", "cl", NULL }; struct color_ext_type @@ -571,7 +571,7 @@ static struct bin_str color_indicator[] = { LEN_STR_PAIR ("34;42") }, /* ow: other-writable: blue on green */ { LEN_STR_PAIR ("30;42") }, /* tw: ow w/ sticky: black on green */ { LEN_STR_PAIR ("30;41") }, /* ca: black on red */ - { LEN_STR_PAIR ("44;37") }, /* hl: white on blue */ + { 0, NULL }, /* mh: disabled by default */ { LEN_STR_PAIR ("\033[K") }, /* cl: clear to end of line */ }; @@ -4106,8 +4106,8 @@ print_color_indicator (const char *name, mode_t mode, int linkok, type = C_CAP; else if ((mode & S_IXUGO) != 0) type = C_EXEC; - else if (is_colored (C_HARDLINK) && (1 < nlink)) - type = C_HARDLINK; + else if (is_colored (C_MULTIHARDLINK) && (1 < nlink)) + type = C_MULTIHARDLINK; } else if (S_ISDIR (mode)) { |