From owner-svn-src-all@FreeBSD.ORG  Mon Dec 23 22:38:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A8B31A42;
 Mon, 23 Dec 2013 22:38:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93FE915AC;
 Mon, 23 Dec 2013 22:38:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNMcfqm078009;
 Mon, 23 Dec 2013 22:38:41 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNMcf11078008;
 Mon, 23 Dec 2013 22:38:41 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201312232238.rBNMcf11078008@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Mon, 23 Dec 2013 22:38:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r259799 - stable/9/usr.sbin/kldxref
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Dec 2013 22:38:41 -0000

Author: jilles
Date: Mon Dec 23 22:38:41 2013
New Revision: 259799
URL: http://svnweb.freebsd.org/changeset/base/259799

Log:
  MFC r256060,r256650: kldxref: Do not depend on the directory order.
  
  Sort the filenames to get a consistent result between machines of the same
  architecture.
  
  Also, sort FTS_D entries after other entries so kldxref -R works properly in
  the uncommon case that a directory contains both subdirectories and modules.
  Previously, this may have happened to work, depending on the order of files
  in the directory.
  
  PR:		bin/182098
  Submitted by:	Derek Schrock (original version)
  Tested by:	Derek Schrock

Modified:
  stable/9/usr.sbin/kldxref/kldxref.c
Directory Properties:
  stable/9/usr.sbin/kldxref/   (props changed)

Modified: stable/9/usr.sbin/kldxref/kldxref.c
==============================================================================
--- stable/9/usr.sbin/kldxref/kldxref.c	Mon Dec 23 22:37:59 2013	(r259798)
+++ stable/9/usr.sbin/kldxref/kldxref.c	Mon Dec 23 22:38:41 2013	(r259799)
@@ -274,6 +274,16 @@ usage(void)
 	exit(1);
 }
 
+static int
+compare(const FTSENT *const *a, const FTSENT *const *b)
+{
+	if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D)
+		return 1;
+	if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D)
+		return -1;
+	return strcmp((*a)->fts_name, (*b)->fts_name);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -315,7 +325,7 @@ main(int argc, char *argv[])
 		err(1, "%s", argv[0]);
 	}
 
-	ftsp = fts_open(argv, fts_options, 0);
+	ftsp = fts_open(argv, fts_options, compare);
 	if (ftsp == NULL)
 		exit(1);