(gobble_file): Fix a bug introduced in 4.5.4 that made it

so that ls --color would no longer highlight the names of files with
the execute bit set when not specified on the command line.
Patch by Michael Stone.  Reported by Stephen Depooter as
Debian bug 175135.

diff --git a/src/ls.c b/src/ls.c
index a8029a4bfe5ec7a076a5b87a47918cecc9a758a4..4b60d1869f27eac1890244f983c39dab5f2f7b95 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -1,5 +1,5 @@
 /* `dir', `vdir' and `ls' directory listing programs for GNU.
-   Copyright (C) 85, 88, 90, 91, 1995-2002 Free Software Foundation, Inc.
+   Copyright (C) 85, 88, 90, 91, 1995-2003 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
@@ -2328,7 +2328,13 @@ gobble_file (const char *name, enum filetype type, int explicit_arg,
              /* --indicator-style=classify (aka -F)
                 requires that we stat each regular file
                 to see if it's executable.  */
-             || (type == normal && indicator_style == classify))))
+             || (type == normal && (indicator_style == classify
+                                    /* This is so that --color ends up
+                                       highlighting files with the executable
+                                       bit set even when options like -F are
+                                       not specified.  */
+                                    || print_with_color)))))
+
     {
       /* `path' is the absolute pathname of this file. */
       int val;