Use <dirent.h> instead of <sys/dir.h>

Using <dirent.h> and struct dirent instead of <sys/dir.h> and struct direct
is preferred and works on Android which lacks sys/dir.h.

See:
http://pubs.opengroup.org/onlinepubs/009695399/basedefs/dirent.h.html

diff --git a/proc/readproc.c b/proc/readproc.c
index 207c438bf9f0a5274e9489d2ee7b477dfb1b6f7b..9e3afc90a5c08906b6c083ca8dffaa365e974a37 100644 (file)
--- a/proc/readproc.c
+++ b/proc/readproc.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <sys/dir.h>
+#include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef WITH_SYSTEMD
@@ -1099,7 +1099,7 @@ next_task:
 // This finds processes in /proc in the traditional way.
 // Return non-zero on success.
 static int simple_nextpid(PROCTAB *restrict const PT, proc_t *restrict const p) {
-  static struct direct *ent;           /* dirent handle */
+  static struct dirent *ent;           /* dirent handle */
   char *restrict const path = PT->path;
   for (;;) {
     ent = readdir(PT->procfs);
@@ -1117,7 +1117,7 @@ static int simple_nextpid(PROCTAB *restrict const PT, proc_t *restrict const p)
 // This finds tasks in /proc/*/task/ in the traditional way.
 // Return non-zero on success.
 static int simple_nexttid(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict const t, char *restrict const path) {
-  static struct direct *ent;           /* dirent handle */
+  static struct dirent *ent;           /* dirent handle */
   if(PT->taskdir_user != p->tgid){
     if(PT->taskdir){
       closedir(PT->taskdir);

diff --git a/proc/sysinfo.c b/proc/sysinfo.c
index 1876980501ea48fcf2e81ff2303f6ca7f7e379b8..ee286f26feaa96154b50fae1797dedeb4b5e1e84 100644 (file)
--- a/proc/sysinfo.c
+++ b/proc/sysinfo.c
@@ -399,7 +399,7 @@ static void crash(const char *filename) {
 /***********************************************************************/
 
 static void getrunners(unsigned int *restrict running, unsigned int *restrict blocked) {
-  struct direct *ent;
+  struct dirent *ent;
   DIR *proc;
 
   *running=0;

diff --git a/proc/sysinfo.h b/proc/sysinfo.h
index adb0519182d37747a06021b464ee171c9b4478a9..1464cb938a2fbb8524121561e7b07e2638b8695f 100644 (file)
--- a/proc/sysinfo.h
+++ b/proc/sysinfo.h
@@ -1,7 +1,7 @@
 #ifndef PROC_SYSINFO_H
 #define PROC_SYSINFO_H
 #include <sys/types.h>
-#include <sys/dir.h>
+#include <dirent.h>
 #include "procps.h"
 
 EXTERN_C_BEGIN

diff --git a/vmstat.c b/vmstat.c
index a2fd3512f29deda87ab8f12571f745cffcdfddc4..ba69ac720f78b8ff769f60c576406fe4d82cb1cf 100644 (file)
--- a/vmstat.c
+++ b/vmstat.c
@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/dir.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <termios.h>