[gentoo-commits] proj/portage-utils:master commit in: /

[Mike Frysinger]

commit:     bb47adc4544369167b931113600d292d2b77c97a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 08:57:17 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 08:57:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bb47adc4

repos.conf: fix behavior on systems w/out d_type

URL: https://bugs.gentoo.org/551696
Reported-by: Fabian Groffen <grobian <AT> gentoo.org>

 main.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 66b3b30..609ed54 100644
--- a/main.c
+++ b/main.c
@@ -460,10 +460,27 @@ static void read_repos_conf(const char *configroot, const char *repos_conf)
 		for (i = 0; i < count; ++i) {
 			const char *name = confs[i]->d_name;
 
-			if (name[0] == '.' || confs[i]->d_type != DT_REG)
+			if (name[0] == '.')
 				continue;
 
+#ifdef DT_UNKNOWN
+			if (confs[i]->d_type != DT_UNKNOWN &&
+			    confs[i]->d_type != DT_REG &&
+			    confs[i]->d_type != DT_LNK)
+				continue;
+#endif
+
 			xasprintf(&sub_conf, "%s/%s", top_conf, name);
+
+#ifdef DT_UNKNOWN
+			if (confs[i]->d_type != DT_REG)
+#endif
+			{
+				struct stat st;
+				if (stat(sub_conf, &st) || S_ISREG(st.st_mode))
+					continue;
+			}
+
 			read_one_repos_conf(sub_conf);
 			free(sub_conf);
 		}