From: Jim Meyering <jim@meyering.net>
Date: Wed, 12 Nov 2003 09:23:03 +0000 (+0000)
Subject: (extract_dirs_from_files): Avoid useless copy operations.
X-Git-Tag: v5.1.0~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bdd30ba17f6a2490c670e121395a70abcca7233;p=thirdparty%2Fcoreutils.git

(extract_dirs_from_files): Avoid useless copy operations.
This avoids a warning valgrind about memcpy with overlapping
source and destination.
---

diff --git a/src/ls.c b/src/ls.c
index c8d471f89a..8243dffcba 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -2582,8 +2582,14 @@ extract_dirs_from_files (const char *dirname, int ignore_dot_and_dot_dot)
      entries.  */
 
   for (i = 0, j = 0; i < files_index; i++)
-    if (files[i].filetype != arg_directory)
-      files[j++] = files[i];
+    {
+      if (files[i].filetype != arg_directory)
+	{
+	  if (j < i)
+	    files[j] = files[i];
+	  ++j;
+	}
+    }
   files_index = j;
 }