1 files changed, 8 insertions, 6 deletions

diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index 7a4d704356b8..933de4991e62 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -685,6 +685,7 @@ main(int argc, char *argv[])
 {
 	FTS *ftsp;
 	FTSENT *p;
+	char *dot = NULL;
 	int opt, fts_options, ival;
 	struct stat sb;
 
@@ -752,14 +753,15 @@ main(int argc, char *argv[])
 			fwrite(&ival, sizeof(ival), 1, fxref);
 			reccnt = 0;
 		}
-		/* skip non-files and separate debug files */
+		/* skip non-files.. */
 		if (p->fts_info != FTS_F)
 			continue;
-		if (p->fts_namelen >= 6 &&
-		    strcmp(p->fts_name + p->fts_namelen - 6, ".debug") == 0)
-			continue;
-		if (p->fts_namelen >= 8 &&
-		    strcmp(p->fts_name + p->fts_namelen - 8, ".symbols") == 0)
+		/*
+		 * Skip files that generate errors like .debug, .symbol and .pkgsave
+		 * by generally skipping all files with 2 dots.
+		 */
+		dot = strchr(p->fts_name, '.');
+		if (dot && strchr(dot + 1, '.') != NULL)
 			continue;
 		read_kld(p->fts_path, p->fts_name);
 	}