Merge topic branch t/misc into pu

[paraslash.git] / string.c

diff --git a/string.c b/string.c
index 1cc59eeaa127f37e34940683b7376c5ad9690743..9fffad13f3586796c2f66d66b884375f71c6570e 100644 (file)
--- a/string.c
+++ b/string.c
@@ -308,21 +308,28 @@ __must_check __malloc char *para_logname(void)
 }
 
 /**
- * Investigate $HOME to get the home directory of the calling user.
+ * Return the expansion of $HOME/.paraslash.
  *
- * \return A pointer to read-only memory that must not be freed by the caller.
- * If the environment variable HOME is unset or empty, the function prints an
- * error message and aborts.
+ * \return A pointer to memory that must not be freed by the caller. If the
+ * environment variable HOME is unset or empty, the function prints an error
+ * message and aborts.
  *
  * \sa getenv(3), getuid(2).
  */
-const char *get_homedir(void)
+const char *get_confdir(void)
 {
-       const char *home = getenv("HOME");
-       if (home && *home)
-               return home;
-       PARA_EMERG_LOG("fatal: HOME is unset or empty");
-       exit(EXIT_FAILURE);
+       static const char *dot_para;
+       const char *home;
+
+       if (dot_para)
+               return dot_para;
+       home = getenv("HOME");
+       if (!home || !*home) {
+               PARA_EMERG_LOG("fatal: HOME is unset or empty");
+               exit(EXIT_FAILURE);
+       }
+       dot_para = make_message("%s/.paraslash", home);
+       return dot_para;
 }
 
 /**