completed fix of wrong colored broken symlinks in ls(#404511)

This commit is contained in:
Ondrej Vasik 2007-11-29 15:44:39 +00:00
parent afa672bdae
commit cfcdd286e6
2 changed files with 15 additions and 2 deletions

View File

@ -72,7 +72,17 @@ diff -ur a/src/ls.c b/src/ls.c
+ || (is_colored (C_EXEC) && color_symlink_as_referent) + || (is_colored (C_EXEC) && color_symlink_as_referent)
|| (is_colored (C_MISSING) && format == long_format)) || (is_colored (C_MISSING) && format == long_format))
check_symlink_color = true; check_symlink_color = true;
@@ -2570,7 +2574,8 @@ gobble_file (char const *name, enum file
|| ((print_inode || format_needs_type)
&& (type == symbolic_link || type == unknown)
&& (dereference == DEREF_ALWAYS
- || (command_line_arg && dereference != DEREF_NEVER)))
+ || (command_line_arg && dereference != DEREF_NEVER)
+ || color_symlink_as_referent || check_symlink_color))
/* Command line dereferences are already taken care of by the above
assertion that the inode number is not yet known. */
|| (print_inode && inode == NOT_AN_INODE_NUMBER)
@@ -2713,6 +2713,12 @@ gobble_file (char const *name, enum filetype type, ino_t inode, @@ -2713,6 +2713,12 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
free (linkname); free (linkname);
} }

View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 6.9 Version: 6.9
Release: 14%{?dist} Release: 15%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -289,6 +289,9 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Thu Nov 29 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-15
- completed fix of wrong colored broken symlinks in ls(#404511)
* Fri Nov 23 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-14 * Fri Nov 23 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-14
- fixed bug in handling YYYYMMDD date format with relative - fixed bug in handling YYYYMMDD date format with relative
signed offset(#377821) signed offset(#377821)