From 69588b109419180ae7069c37458656e109eaa3ad Mon Sep 17 00:00:00 2001
From: Peifeng Yu <peifeng@umich.edu>
Date: Wed, 3 Jan 2018 20:35:37 -0500
Subject: [PATCH] build: fix compiler warnings

- minor moved to <sys/sysmacros.h>
- readdir_r is deprecated
---
 src/kmscon_module.c | 18 ++++++------------
 src/uterm_vt.c      |  1 +
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/kmscon_module.c b/src/kmscon_module.c
index 2bf0576..f960c50 100644
--- a/src/kmscon_module.c
+++ b/src/kmscon_module.c
@@ -181,7 +181,7 @@ void kmscon_load_modules(void)
 {
 	int ret;
 	DIR *ent;
-	struct dirent *buf, *de;
+	struct dirent *de;
 	char *file;
 	struct kmscon_module *mod;
 
@@ -203,18 +203,13 @@ void kmscon_load_modules(void)
 		return;
 	}
 
-	ret = shl_dirent(BUILD_MODULE_DIR, &buf);
-	if (ret) {
-		log_error("cannot allocate dirent object");
-		closedir(ent);
-		return;
-	}
-
 	while (true) {
-		ret = readdir_r(ent, buf, &de);
-		if (ret != 0) {
+        errno = 0;
+        de = readdir(ent);
+		if (!de && errno != 0) {
+            int errsv = errno;
 			log_error("cannot read directory %s: %d",
-				  BUILD_MODULE_DIR, ret);
+				  BUILD_MODULE_DIR, errsv);
 			break;
 		} else if (!de) {
 			break;
@@ -255,7 +250,6 @@ void kmscon_load_modules(void)
 		shl_dlist_link(&module_list, &mod->list);
 	}
 
-	free(buf);
 	closedir(ent);
 }
 
diff --git a/src/uterm_vt.c b/src/uterm_vt.c
index af377f5..fbe9e76 100644
--- a/src/uterm_vt.c
+++ b/src/uterm_vt.c
@@ -40,6 +40,7 @@
 #include <sys/ioctl.h>
 #include <sys/signalfd.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>