diff --git a/src/utils/os.c b/src/utils/os.c
index 8ab52c75bc023c2bc5b68ca61d2cc0f13ce0f916..653d88d05585ffe217343e1e2a1adbbea04296d6 100644 (file)
--- a/src/utils/os.c
+++ b/src/utils/os.c
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);
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;