lib/configuration.c, etc.: Remove arguments from `config_userconf'.

Nobody ever did anything with the HOME argument at all.  Passing in PW
might have been slightly valuable, but configuration is only retrieved
infrequently.

Besides, this is the start of a sequence of changes to how configuration
files are found.

diff --git a/disobedience/login.c b/disobedience/login.c
index 0c6e7d74dd44756d10f123f6bbaba055aafc59e3..ae5f415f43273ed6e5b82beb0cd3a19a1f991f0e 100644 (file)
--- a/disobedience/login.c
+++ b/disobedience/login.c
@@ -156,7 +156,7 @@ static void login_update_config(struct config *c) {
 
 /** @brief Save current login details */
 static void login_save_config(void) {
 
 /** @brief Save current login details */
 static void login_save_config(void) {

-  char *path = config_userconf(0, 0), *tmp;
+  char *path = config_userconf(), *tmp;

   FILE *fp;
 
   byte_xasprintf(&tmp, "%s.tmp", path);
   FILE *fp;
 
   byte_xasprintf(&tmp, "%s.tmp", path);

diff --git a/lib/configuration.c b/lib/configuration.c
index bd9c65dba4cd003e259a1dbf146a8eb33606a900..b5561dc1ade3e9cd88189bb65a87b474e58ad115 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -1606,7 +1606,7 @@ int config_read(int server,
     xfree(privconf);
 #endif
     /* if we have a password file, read it */
     xfree(privconf);
 #endif
     /* if we have a password file, read it */

-    if((privconf = config_userconf(0, pw))
+    if((privconf = config_userconf())

        && access(privconf, F_OK) == 0
        && config_include(c, privconf))
       return -1;
        && access(privconf, F_OK) == 0
        && config_include(c, privconf))
       return -1;


@@ -1672,7 +1672,7 @@ char *config_private(void) {
 }
 
 /** @brief Return the path to user's personal configuration file */
 }
 
 /** @brief Return the path to user's personal configuration file */

-char *config_userconf(const char *home, const struct passwd *pw) {
+char *config_userconf(void) {

   char *s;
 #if _WIN32
   wchar_t *wpath = 0;
   char *s;
 #if _WIN32
   wchar_t *wpath = 0;


@@ -1683,9 +1683,10 @@ char *config_userconf(const char *home, const struct passwd *pw) {
   CoTaskMemFree(wpath);
   byte_xasprintf(&s, "%s\\DisOrder\\passwd", appdata);
 #else
   CoTaskMemFree(wpath);
   byte_xasprintf(&s, "%s\\DisOrder\\passwd", appdata);
 #else

-  if(!home && !pw && !(pw = getpwuid(getuid())))
+  struct passwd *pw;
+  if(!(pw = getpwuid(getuid())))

     disorder_fatal(0, "cannot determine our username");
     disorder_fatal(0, "cannot determine our username");

-  byte_xasprintf(&s, "%s/.disorder/passwd", home ? home : pw->pw_dir);
+  byte_xasprintf(&s, "%s/.disorder/passwd", pw->pw_dir);

 #endif
   return s;
 }
 #endif
   return s;
 }

diff --git a/lib/configuration.h b/lib/configuration.h
index 284ae7a9450ef210c515b21edb667cac83eb148b..46a6272ec8487eddded45e9b08e8cdaf4cc1f23f 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -342,9 +342,8 @@ char *config_get_file(const char *name);
 
 struct passwd;
 
 
 struct passwd;
 

-char *config_userconf(const char *home, const struct passwd *pw);
-/* get the user's own private conffile, assuming their home dir is
- * @home@ if not null and using @pw@ otherwise */
+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 */
 
 char *config_usersysconf(const struct passwd *pw );
 /* get the user's conffile in /etc */