]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
(extract_dirs_from_files): Avoid useless copy operations.
authorJim Meyering <jim@meyering.net>
Wed, 12 Nov 2003 09:23:03 +0000 (09:23 +0000)
committerJim Meyering <jim@meyering.net>
Wed, 12 Nov 2003 09:23:03 +0000 (09:23 +0000)
This avoids a warning valgrind about memcpy with overlapping
source and destination.

src/ls.c

index c8d471f89aed831109d956e17342a01a72b20239..8243dffcba333c3cb95dd219b7886759d7bbb10f 100644 (file)
--- 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;
 }