entropy: Port to OpenBSD

[slstatus.git] / components / num_files.c

diff --git a/components/num_files.c b/components/num_files.c
index c471400..1a918ac 100644 (file)
--- a/components/num_files.c
+++ b/components/num_files.c
@@ -1,4 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

+#include <errno.h>

 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>


@@ -12,14 +13,15 @@ num_files(const char *dir)
        DIR *fd;
        int num = 0;
 
        DIR *fd;
        int num = 0;
 

-       if ((fd = opendir(dir)) == NULL) {
-               fprintf(stderr, "Failed to get number of files in directory %s", dir);
+       if (!(fd = opendir(dir))) {
+               fprintf(stderr, "opendir '%s': %s\n", dir, strerror(errno));

                return NULL;
        }
 
                return NULL;
        }
 

-       while ((dp = readdir(fd)) != NULL) {
-               if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+       while ((dp = readdir(fd))) {
+               if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {

                        continue; /* skip self and parent */
                        continue; /* skip self and parent */

+               }

                num++;
        }
 
                num++;
        }