diff --git a/src/utils/os.c b/src/utils/os.c
index d8f707418b9cadb57040ef20473e6ee7d9b1de7d..2b6a51460a67f89122dbee5ec7d75d70e2b3fe82 100644 (file)
--- a/src/utils/os.c
+++ b/src/utils/os.c
* public API
*/
+char *
+sdb_get_homedir(void)
+{
+ char *username = sdb_get_current_user();
+
+ struct passwd pw_entry;
+ struct passwd *result = NULL;
+
+ char buf[4096];
+
+ int status;
+
+ if (username) {
+ memset(&pw_entry, 0, sizeof(pw_entry));
+ status = getpwnam_r(username, &pw_entry, buf, sizeof(buf), &result);
+ }
+ else
+ status = -1;
+
+ if (status || (! result)) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_WARNING, "os: Failed to determine home directory "
+ "for user %s: %s", username,
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ free(username);
+ return NULL;
+ }
+ free(username);
+ return strdup(result->pw_dir);
+} /* sdb_get_homedir */
+
+char *
+sdb_realpath(const char *path)
+{
+ if (! path)
+ return NULL;
+
+ if ((strlen(path) >= 2) && (path[0] == '~') && (path[1] == '/')) {
+ char *homedir = sdb_get_homedir();
+ char tmp[(homedir ? strlen(homedir) : 0) + strlen(path)];
+ char *ret;
+
+ if (! homedir)
+ return NULL;
+
+ snprintf(tmp, sizeof(tmp), "%s/%s", homedir, path + 2);
+ ret = realpath(tmp, NULL);
+ free(homedir);
+ return ret;
+ }
+
+ return realpath(path, NULL);
+} /* sdb_realpath */
+
int
sdb_mkdir_all(const char *pathname, mode_t mode)
{
uid_t uid;
- char buf[1024];
+ char buf[4096];
int status;
uid = geteuid();
if (address) {
host = address;
- port = strchr(host, ':');
+ port = strrchr(host, ':');
if (port) {
*port = '\0';
++port;
ai_hints.ai_family = AF_INET6;
else
ai_hints.ai_family = AF_UNSPEC;
+
if ((network & SDB_NET_IP) == SDB_NET_IP) {
ai_hints.ai_socktype = 0;
ai_hints.ai_protocol = 0;
}
else if (network & SDB_NET_UDP) {
ai_hints.ai_socktype = SOCK_DGRAM;
- ai_hints.ai_socktype = IPPROTO_UDP;
+ ai_hints.ai_protocol = IPPROTO_UDP;
}
status = getaddrinfo(host, port, &ai_hints, res);