From 97621d4661264e654f605753cd54e9ae39c083ac Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Wed, 2 Oct 2013 11:03:07 +0200
Subject: [PATCH] Use getlogin(3) in the shell instead of the USERNAME
 variable.

---
 utils/mxsh.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/mxsh.cpp b/utils/mxsh.cpp
index 2c088b2b..beee7452 100644
--- a/utils/mxsh.cpp
+++ b/utils/mxsh.cpp
@@ -296,7 +296,9 @@ int get_and_run_command(FILE* fp, const char* fpname, bool interactive,
 		                  | TERMMODE_LINEBUFFER
 		                  | TERMMODE_ECHO;
 		settermmode(fd, termmode);
-		const char* print_username = getenv_safe("USERNAME", "root");
+		const char* print_username = getlogin();
+		if ( !print_username )
+			print_username = getuid() == 0 ? "root" : "?";
 		const char* print_hostname = getenv_safe("HOSTNAME", "sortix");
 		const char* print_dir = getenv_safe("PWD", "?");
 		const char* home_dir = getenv_safe("HOME", "/root");