lib:util: Add path_expand_tilde()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14370

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 15457254be0ab1235c327bd305dfeee19b2ea7a1)

diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
index 0473557dfc6632ff352cc3a2001e8995dcf27708..c05246a7407fa3a61ff0f7f79bc5aeab1d181a29 100644 (file)
--- a/lib/util/util_paths.c
+++ b/lib/util/util_paths.c
@@ -6,6 +6,7 @@
    Copyright (C) Simo Sorce 2001
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) James Peach 2006
+   Copyright (c) 2020      Andreas Schneider <asn@samba.org>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
 #include "includes.h"
 #include "dynconfig/dynconfig.h"
 #include "lib/util/util_paths.h"
+#include "system/passwd.h"
 
 /**
  * @brief Returns an absolute path to a file in the Samba modules directory.
@@ -62,3 +64,73 @@ const char *shlib_ext(void)
        return get_dyn_SHLIBEXT();
 }
 
+static char *get_user_home_dir(TALLOC_CTX *mem_ctx)
+{
+       struct passwd pwd = {0};
+       struct passwd *pwdbuf = NULL;
+       char buf[NSS_BUFLEN_PASSWD] = {0};
+       int rc;
+
+       rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
+       if (rc != 0 || pwdbuf == NULL ) {
+               const char *szPath = getenv("HOME");
+               if (szPath == NULL) {
+                       return NULL;
+               }
+               snprintf(buf, sizeof(buf), "%s", szPath);
+
+               return talloc_strdup(mem_ctx, buf);
+       }
+
+       return talloc_strdup(mem_ctx, pwd.pw_dir);
+}
+
+char *path_expand_tilde(TALLOC_CTX *mem_ctx, const char *d)
+{
+       char *h = NULL, *r = NULL;
+       const char *p = NULL;
+       struct stat sb = {0};
+       int rc;
+
+       if (d[0] != '~') {
+               return talloc_strdup(mem_ctx, d);
+       }
+       d++;
+
+       /* handle ~user/path */
+       p = strchr(d, '/');
+       if (p != NULL && p > d) {
+               struct passwd *pw;
+               size_t s = p - d;
+               char u[128];
+
+               if (s >= sizeof(u)) {
+                       return NULL;
+               }
+               memcpy(u, d, s);
+               u[s] = '\0';
+
+               pw = getpwnam(u);
+               if (pw == NULL) {
+                       return NULL;
+               }
+               h = talloc_strdup(mem_ctx, pw->pw_dir);
+       } else {
+               p = d;
+               h = get_user_home_dir(mem_ctx);
+       }
+       if (h == NULL) {
+               return NULL;
+       }
+
+       rc = stat(h, &sb);
+       if (rc != 0) {
+               TALLOC_FREE(h);
+               return NULL;
+       }
+
+       r = talloc_asprintf(mem_ctx, "%s%s", h, p);
+       TALLOC_FREE(h);
+
+       return r;
+}

diff --git a/lib/util/util_paths.h b/lib/util/util_paths.h
index 80e8aaac6e95eec7e822b1ef0297c7218b70eadf..cf34f691e5f6f29fd652f79de4ab3a90cfb7ff01 100644 (file)
--- a/lib/util/util_paths.h
+++ b/lib/util/util_paths.h
@@ -51,4 +51,13 @@ char *data_path(TALLOC_CTX *mem_ctx, const char *name);
  **/
 const char *shlib_ext(void);
 
+/**
+ * @brief Expand a directory starting with a tilde '~'
+ *
+ * @param[in]  d        The directory to expand.
+ *
+ * @return              The expanded directory, NULL on error.
+ */
+char *path_expand_tilde(TALLOC_CTX *mem_ctx, const char *d);
+
 #endif