svn commit: r282917 - stable/9/bin/cp

[Jilles Tjoelker]

Author: jilles
Date: Thu May 14 19:32:13 2015
New Revision: 282917
URL: https://svnweb.freebsd.org/changeset/base/282917

Log:
  MFC r282482: cp: Remove fts sorting.
  
  In an attempt to improve performance, cp reordered directories first
  (although the comment says directories last). This is not effective with new
  UFS layout policies.
  
  The sorting reorders multiple arguments passed to cp, which may be
  undesirable.
  
  Additionally, the comparison function does not induce a total order. Per
  POSIX, this causes undefined behaviour in qsort().
  
  NetBSD removed the sorting in 2009.
  
  On filesystems that return directory entries in hash/btree order, sorting by
  d_fileno before statting improves performance on large directories. However,
  this can only be implemented in fts(3).
  
  PR:		53475
  Reviewed by:	bde (in 2004)

Modified:
  stable/9/bin/cp/cp.c
Directory Properties:
  stable/9/bin/cp/   (props changed)

Modified: stable/9/bin/cp/cp.c
==============================================================================
--- stable/9/bin/cp/cp.c	Thu May 14 18:29:05 2015	(r282916)
+++ stable/9/bin/cp/cp.c	Thu May 14 19:32:13 2015	(r282917)
@@ -90,7 +90,6 @@ volatile sig_atomic_t info;
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
 
 static int copy(char *[], enum op, int);
-static int mastercmp(const FTSENT * const *, const FTSENT * const *);
 static void siginfo(int __unused);
 
 int
@@ -274,7 +273,7 @@ copy(char *argv[], enum op type, int fts
 	mask = ~umask(0777);
 	umask(~mask);
 
-	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
+	if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
 		err(1, "fts_open");
 	for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
 		switch (curr->fts_info) {
@@ -488,32 +487,6 @@ copy(char *argv[], enum op type, int fts
 	return (rval);
 }
 
-/*
- * mastercmp --
- *	The comparison function for the copy order.  The order is to copy
- *	non-directory files before directory files.  The reason for this
- *	is because files tend to be in the same cylinder group as their
- *	parent directory, whereas directories tend not to be.  Copying the
- *	files first reduces seeking.
- */
-static int
-mastercmp(const FTSENT * const *a, const FTSENT * const *b)
-{
-	int a_info, b_info;
-
-	a_info = (*a)->fts_info;
-	if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR)
-		return (0);
-	b_info = (*b)->fts_info;
-	if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR)
-		return (0);
-	if (a_info == FTS_D)
-		return (-1);
-	if (b_info == FTS_D)
-		return (1);
-	return (0);
-}
-
 static void
 siginfo(int sig __unused)
 {