merge with 1.9a

1 files changed, 13 insertions, 1 deletions

diff --git a/src/who.c b/src/who.c
index f01da1b09..331937e08 100644
--- a/src/who.c
+++ b/src/who.c
@@ -327,7 +327,19 @@ list_entries (n)
 #endif
 	 )
 	{
-	  printf ("%s ", this->ut_name);
+	  char trimmed_name[sizeof (this->ut_name) + 1];
+	  int i;
+
+	  strncpy (trimmed_name, this->ut_name, sizeof (this->ut_name));
+	  trimmed_name[sizeof (this->ut_name)] = ' ';
+	  for (i = 0; i <= sizeof (this->ut_name); i++)
+	    {
+	      if (trimmed_name[i] == ' ')
+		break;
+	    }
+	  trimmed_name[i] = '\0';
+
+	  printf ("%s ", trimmed_name);
 	  entries++;
 	}
       this++;