Automatically prefix all log messages with the plugin name (if available).

[sysdb.git] / src / utils / os.c

diff --git a/src/utils/os.c b/src/utils/os.c
index 2b6a51460a67f89122dbee5ec7d75d70e2b3fe82..653d88d05585ffe217343e1e2a1adbbea04296d6 100644 (file)
--- a/src/utils/os.c
+++ b/src/utils/os.c
@@ -35,8 +35,11 @@
 #include <errno.h>
 
 #include <sys/types.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
 #include <dirent.h>
 
@@ -48,6 +51,7 @@
 #include <libgen.h>
 #include <netdb.h>
 #include <pwd.h>
+#include <time.h>
 
 /*
  * public API
@@ -74,7 +78,7 @@ sdb_get_homedir(void)
 
        if (status || (! result)) {
                char errbuf[1024];
-               sdb_log(SDB_LOG_WARNING, "os: Failed to determine home directory "
+               sdb_log(SDB_LOG_WARNING, "Failed to determine home directory "
                                "for user %s: %s", username,
                                sdb_strerror(errno, errbuf, sizeof(errbuf)));
                free(username);
@@ -168,26 +172,25 @@ sdb_remove_all(const char *pathname)
                        return -1;
 
                while (42) {
-                       struct dirent de;
-                       struct dirent *res = NULL;
+                       struct dirent *de;
+                       char filename[strlen(pathname) + sizeof(de->d_name) + 2];
 
-                       char filename[strlen(pathname) + sizeof(de.d_name) + 2];
+                       errno = 0;
+                       de = readdir(d);
+                       if (! de) {
+                               if (errno == 0)
+                                       break;
 
-                       memset(&de, 0, sizeof(de));
-                       if (readdir_r(d, &de, &res)) {
                                closedir(d);
                                return -1;
                        }
 
-                       if (! res)
-                               break;
-
-                       if ((de.d_name[0] == '.') && ((de.d_name[1] == '\0')
-                                               || ((de.d_name[1] == '.')&& (de.d_name[2] == '\0'))))
+                       if ((de->d_name[0] == '.') && ((de->d_name[1] == '\0')
+                                               || ((de->d_name[1] == '.')&& (de->d_name[2] == '\0'))))
                                continue;
 
                        snprintf(filename, sizeof(filename),
-                                       "%s/%s", pathname, de.d_name);
+                                       "%s/%s", pathname, de->d_name);
                        if (sdb_remove_all(filename)) {
                                closedir(d);
                                return -1;