From 642bc1acfb41bc0c4d6d9e286b8975336c211659 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 14 Jan 2003 16:22:55 +0000 Subject: [PATCH] (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. --- src/ls.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ls.c b/src/ls.c index a8029a4bfe..4b60d1869f 100644 --- 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; -- 2.47.2