[mw-devel] [Git][arthur/mw][master] 2 commits: Fix readline-related build failures

[Andrew Price]

Andrew Price pushed to branch master at Justin Mitchell / mw


Commits:
9a942a50 by Andrew Price at 2015-10-19T22:15:00Z
Fix readline-related build failures

- - - - -
32d6e80e by Andrew Price at 2015-10-19T22:45:01Z
Fix build failure on Debian Wheezy

- - - - -


2 changed files:

- src/client/main.c
- src/server/servercfg.c


Changes:

=====================================
src/client/main.c
=====================================
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -532,9 +532,9 @@ int main(int argc, char **argv)
 		/* setup readline support */
 		UseRL=1;
 		rl_readline_name = "Milliways";
-		rl_attempted_completion_function= (CPPFunction *)complete_entry;
-		rl_completion_entry_function= (CPFunction *)dummy_list;
-		rl_directory_rewrite_hook= (Function *)expand_script_dir;
+		rl_attempted_completion_function = complete_entry;
+		rl_completion_entry_function = dummy_list;
+		rl_directory_rewrite_hook = expand_script_dir;
 	}
 
 	signal(SIGPIPE,SIG_IGN);


=====================================
src/server/servercfg.c
=====================================
--- a/src/server/servercfg.c
+++ b/src/server/servercfg.c
@@ -145,7 +145,7 @@ static int cfg_load_default_path(void)
 	const char *etcconf;
 	int ret;
 
-	homedir = secure_getenv("HOME");
+	homedir = getenv("HOME");
 	if (homedir) {
 		ret = asprintf(&homeconf, "%s/.mwserv.conf", homedir);
 		if (ret > 0) {



View it on GitLab: https://projects.sucs.org/arthur/mw/compare/83256d1cfa210f8436c88deb59bef52387721ce1...32d6e80e843389d695b5568eb6a40a02b1b4822b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/mw-devel/attachments/20151019/a13e1f80/attachment.html>