From: Jim Meyering <jim@meyering.net>
Date: Tue, 20 Feb 2001 08:16:47 +0000 (+0000)
Subject: `ls -Fd symlink-to-directory' would print a trailing `/'
X-Git-Tag: TEXTUTILS-2_0_12~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05c801ff0ce39f850abaa1733840b2fa24ab5258;p=thirdparty%2Fcoreutils.git

`ls -Fd symlink-to-directory' would print a trailing `/'
Now it prints a trailing `@'.

(gobble_file): Don't clobber lstat stats of command line
arguments when using -d and -F (--directory and --classify) options.
---

diff --git a/src/ls.c b/src/ls.c
index c5701698c3..6f7bae6ef0 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -1933,7 +1933,8 @@ gobble_file (const char *name, enum filetype type, int explicit_arg,
 #endif
 
       if (S_ISLNK (files[files_index].stat.st_mode)
-	  && (explicit_arg || format == long_format || check_symlink_color))
+	  && ((explicit_arg && ! immediate_dirs)
+	      || format == long_format || check_symlink_color))
 	{
 	  char *linkpath;
 	  struct stat linkstats;