![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/utils/os.c b/src/utils/os.c
index b1e143a6a651d140e0ee10ce36fdff7f05da421b..747a3700014bd248f19230bfd0363ccba55437ee 100644 (file)
--- a/src/utils/os.c
+++ b/src/utils/os.c
#endif /* HAVE_CONFIG_H */
#include "utils/os.h"
+#include "utils/error.h"
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <dirent.h>
+
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <libgen.h>
+#include <pwd.h>
/*
- * private helper functions
+ * public API
*/
-/*
- * Recursively create the directory 'pathname' using the specified 'mode'. If
- * 'enforce_mode' is true, the mode will be enforced even if the directory
- * exists already.
- */
-static int
-mkdir_rec(const char *pathname, mode_t mode, _Bool enforce_mode)
+int
+sdb_mkdir_all(const char *pathname, mode_t mode)
{
struct stat st;
+ char *pathname_copy;
char *base_dir;
int status = 0;
errno = ENOTDIR;
return -1;
}
-
- if ((st.st_mode != mode) && enforce_mode)
- return chmod(pathname, mode);
return 0;
}
/* pathname exists but we cannot access it */
return -1;
- base_dir = strdup(pathname);
- if (! base_dir)
+ pathname_copy = strdup(pathname);
+ if (! pathname_copy)
return -1;
- base_dir = dirname(base_dir);
+ base_dir = dirname(pathname_copy);
- /* don't enforce the mode on parent directories */
- status = mkdir_rec(base_dir, mode, 0);
+ status = sdb_mkdir_all(base_dir, mode);
if (! status)
status = mkdir(pathname, mode);
- free(base_dir);
+ free(pathname_copy);
return status;
-} /* mkdir_rec */
+} /* sdb_mkdir_all */
-/*
- * public API
- */
+int
+sdb_remove_all(const char *pathname)
+{
+ struct stat st;
+
+ if ((! pathname) || (! *pathname)) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ memset(&st, 0, sizeof(st));
+ if (stat(pathname, &st))
+ return -1;
+
+ if (S_ISDIR(st.st_mode)) {
+ DIR *d = opendir(pathname);
+
+ if (! d)
+ return -1;
+
+ while (42) {
+ struct dirent de;
+ struct dirent *res = NULL;
+
+ char filename[strlen(pathname) + sizeof(de.d_name) + 2];
+
+ 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'))))
+ continue;
+
+ snprintf(filename, sizeof(filename),
+ "%s/%s", pathname, de.d_name);
+ if (sdb_remove_all(filename)) {
+ closedir(d);
+ return -1;
+ }
+ }
+ closedir(d);
+ }
+ return remove(pathname);
+} /* sdb_remove_all */
+
+char *
+sdb_get_current_user(void)
+{
+ struct passwd pw_entry;
+ struct passwd *result = NULL;
+
+ uid_t uid;
+
+ char buf[1024];
+ int status;
+
+ uid = geteuid();
+ memset(&pw_entry, 0, sizeof(pw_entry));
+ status = getpwuid_r(uid, &pw_entry, buf, sizeof(buf), &result);
+
+ if (status || (! result)) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_ERR, "Failed to determine current username: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ return NULL;
+ }
+ return strdup(result->pw_name);
+} /* sdb_get_current_user */
int
-sdb_mkdir_all(const char *pathname, mode_t mode)
+sdb_select(int fd, int type)
{
- return mkdir_rec(pathname, mode, 1);
-} /* sdb_mkdir_all */
+ fd_set fds;
+ fd_set *readfds = NULL;
+ fd_set *writefds = NULL;
+ fd_set *exceptfds = NULL;
+
+ if (fd < 0) {
+ errno = EBADF;
+ return -1;
+ }
+
+ FD_ZERO(&fds);
+
+ switch (type) {
+ case SDB_SELECTIN:
+ readfds = &fds;
+ break;
+ case SDB_SELECTOUT:
+ writefds = &fds;
+ break;
+ case SDB_SELECTERR:
+ exceptfds = &fds;
+ break;
+ default:
+ errno = EINVAL;
+ return -1;
+ }
+
+ FD_SET(fd, &fds);
+
+ while (42) {
+ int n;
+ errno = 0;
+ n = select(fd + 1, readfds, writefds, exceptfds, NULL);
+
+ if ((n < 0) && (errno != EINTR))
+ return n;
+ if (n > 0)
+ break;
+ }
+ return 0;
+} /* sdb_select */
+
+ssize_t
+sdb_write(int fd, size_t msg_len, const void *msg)
+{
+ const char *buf;
+ size_t len;
+
+ if ((fd < 0) || (msg_len && (! msg)))
+ return -1;
+ if (! msg_len)
+ return 0;
+
+ buf = msg;
+ len = msg_len;
+ while (len > 0) {
+ ssize_t status;
+
+ if (sdb_select(fd, SDB_SELECTOUT))
+ return -1;
+
+ errno = 0;
+ status = write(fd, buf, len);
+ if (status < 0) {
+ if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+ continue;
+ if (errno == EINTR)
+ continue;
+
+ return status;
+ }
+
+ len -= (size_t)status;
+ buf += status;
+ }
+
+ return (ssize_t)msg_len;
+} /* sdb_write */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */