Merge branch 'obsd-master'

Conflicts: Makefile format.c
2025-09-02 21:56:57 +00:00 · 2015-08-30 21:44:01 +01:00
parent 486421ceff b87dc608d9
commit cb89f2f2a1
26 changed files with 594 additions and 388 deletions
--- a/tmux.c
+++ b/tmux.c
@ -200,7 +200,7 @@ shell_exec(const char *shell, const char *shellcmd)
 	fatal("execl failed");
 }

-const char*
+const char *
 find_home(void)
 {
 	struct passwd	*pw;
@ -215,7 +215,7 @@ find_home(void)
 			home = NULL;
 	}

-	return home;
+	return (home);
 }

 int