Fix admin profile config and support APPDATA.

Only use ALLUSERPROFILE for home dir when USERPROFILE is not set, even for admin users. Fix #34. Also on Windows when looking for the rc, look in getenv("APPDATA") instead of getenv("XDG_CONFIG_HOME"), which is mostly equivalent. Signed-off-by: Rafael Kitover <[email protected]>
lhmouse · May 31, 2022 · e51f129 · e51f129
1 parent a803a8a
commit e51f129
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -1725,7 +1725,11 @@ void do_rcfiles(void)
 		parse_one_nanorc();
 
 	if (custom_nanorc == NULL) {
+#ifndef _WIN32
 		const char *xdgconfdir = getenv("XDG_CONFIG_HOME");
+#else
+		const char *xdgconfdir = getenv("APPDATA");
+#endif
 
 		get_homedir();
 

diff --git a/src/utils.c b/src/utils.c
@@ -36,9 +36,7 @@ void get_homedir(void)
 	if (homedir == NULL) {
 		const char *homenv = getenv("USERPROFILE");
 
-		/* When HOME isn't set, or when we're root, get the home directory
-		 * from the password file instead. */
-		if (homenv == NULL || IsUserAnAdmin())
+		if (homenv == NULL)
 			homenv = getenv("ALLUSERSPROFILE");
 
 		/* Only set homedir if some home directory could be determined,