lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

Exactly analogous to the existing `configfile' variable.

diff --git a/disobedience/login.c b/disobedience/login.c
index ae5f415f43273ed6e5b82beb0cd3a19a1f991f0e..fb8cf715875b5421bdddd2bf4890cbb2aee77fde 100644 (file)
--- a/disobedience/login.c
+++ b/disobedience/login.c
@@ -156,10 +156,10 @@ static void login_update_config(struct config *c) {
 
 /** @brief Save current login details */
 static void login_save_config(void) {
-  char *path = config_userconf(), *tmp;
+  char *tmp;
   FILE *fp;
 
-  byte_xasprintf(&tmp, "%s.tmp", path);
+  byte_xasprintf(&tmp, "%s.tmp", userconfigfile);
   /* Make sure the directory exists; don't care if it already exists. */
   mkdir(d_dirname(tmp), 02700);
   /* Write out the file */
@@ -190,7 +190,7 @@ static void login_save_config(void) {
     goto done;
   }
   /* Rename into place */
-  if(rename(tmp, path) < 0) {
+  if(rename(tmp, userconfigfile) < 0) {
     fpopup_msg(GTK_MESSAGE_ERROR, "error renaming %s: %s",
                tmp, strerror(errno));
     goto done;

diff --git a/lib/configuration.c b/lib/configuration.c
index 56a96964d9b422ebea6289a6e09437b7aba0273e..469804d41826b9c47c279849e974da5a81f08fef 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -66,6 +66,12 @@
  */
 char *configfile;
 
+/** @brief Path to user's config file
+ *
+ * set_configfile() sets the default if it is null.
+ */
+char *userconfigfile;
+
 /** @brief Read user configuration
  *
  * If clear, the user-specific configuration is not read.
@@ -1451,6 +1457,8 @@ char *config_get_file2(struct config *c, const char *name) {
 
 /** @brief Set the default configuration file */
 static void set_configfile(void) {
+  char *t;
+
 #if !_WIN32
   if(!configfile) {
     configfile = getenv("DISORDER_CONFIG");
@@ -1458,6 +1466,11 @@ static void set_configfile(void) {
       byte_xasprintf(&configfile, "%s/config", pkgconfdir);
   }
 #endif
+  if(!userconfigfile && config_per_user) {
+    if((t = getenv("DISORDER_USERCONFIG"))) userconfigfile = xstrdup(t);
+    else if(!(userconfigfile = profile_filename("passwd")))
+      disorder_fatal(0, "failed to find user profile directory");
+  }
 }
 
 /** @brief Free a configuration object
@@ -1607,11 +1620,9 @@ int config_read(int server,
     xfree(privconf);
 #endif
     /* if we have a password file, read it */
-    if((privconf = config_userconf())
-       && access(privconf, F_OK) == 0
-       && config_include(c, privconf))
+    if(access(userconfigfile, F_OK) == 0
+       && config_include(c, userconfigfile))
       return -1;
-    xfree(privconf);
   }
   /* install default namepart and transform settings */
   config_postdefaults(c, server);
@@ -1666,19 +1677,13 @@ char *config_private(void) {
 #else
   char *s;
 
+  if((s = getenv("DISORDER_PRIVCONFIG"))) return xstrdup(s);
   set_configfile();
   byte_xasprintf(&s, "%s.private", configfile);
   return s;
 #endif
 }
 
-/** @brief Return the path to user's personal configuration file */
-char *config_userconf(void) {
-  char *t;
-  if((t = getenv("DISORDER_USERCONFIG"))) return xstrdup(t);
-  return profile_filename("passwd");
-}
-
 #if !_WIN32
 /** @brief Return the path to user-specific system configuration */
 char *config_usersysconf(const struct passwd *pw) {

diff --git a/lib/configuration.h b/lib/configuration.h
index 46a6272ec8487eddded45e9b08e8cdaf4cc1f23f..0fbf0bba7b989d0dd3dd403998f2b83fab55e487 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -342,9 +342,6 @@ char *config_get_file(const char *name);
 
 struct passwd;
 
-char *config_userconf(void);
-/* get the user's own private conffile */
-
 char *config_usersysconf(const struct passwd *pw );
 /* get the user's conffile in /etc */
 
@@ -355,7 +352,7 @@ int config_verify(void);
 
 void config_free(struct config *c);
 
-extern char *configfile;
+extern char *configfile, *userconfigfile;
 extern int config_per_user;
 
 extern const struct uaudio *const *config_uaudio_apis;