From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 28 Aug 2013 17:31:48 +0000 (+0100)
Subject: last: trim trailing white spaces
X-Git-Tag: v2.24-rc1~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97bbb5e41c1a41a1306aedc20d2fd4331d58730a;p=thirdparty%2Futil-linux.git

last: trim trailing white spaces

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/login-utils/last.c b/login-utils/last.c
index dd0ca4912d..73a4b4791d 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -348,6 +348,23 @@ static int time_formatter(const struct last_control *ctl, char *dst,
 	return ret;
 }
 
+/*
+ *	Remove trailing spaces from a string.
+ */
+static void trim_trailing_spaces(char *s)
+{
+	char *p;
+
+	for (p = s; *p; ++p)
+		continue;
+	while (p > s && isspace(*--p))
+		continue;
+	if (p > s)
+		++p;
+	*p++ = '\n';
+	*p = '\0';
+}
+
 /*
  *	Show one line of information on screen
  */
@@ -490,6 +507,7 @@ static int list(const struct last_control *ctl, struct utmp *p, time_t t, int wh
 #  endif
 #endif
 
+	trim_trailing_spaces(final);
 	/*
 	 *	Print out "final" string safely.
 	 */
diff --git a/tests/expected/last/last b/tests/expected/last/last
index 772a738916..baa6ebcd1e 100644
--- a/tests/expected/last/last
+++ b/tests/expected/last/last
@@ -56,7 +56,7 @@ torvalds linux        Mon Aug 26 00:57   still logged in
 wtmp begins Wed Aug 28 03:00:00 2013
 ~~~ full times ~~~
 rick     long         never-gonna-logo Thu Jan  1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14)
-torvalds linux        hobby            Mon Aug 26 00:57:08 1991   still logged in          
+torvalds linux        hobby            Mon Aug 26 00:57:08 1991   still logged in
 reboot   system boot  system-name      Wed Aug 28 18:00:00 2013 - Wed Aug 28 18:50:27 2013  (00:50)
 reboot   system boot  system-name      Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013  (01:00)
 IPv4     root         dns-server       Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013  (01:00)
@@ -90,7 +90,7 @@ accounti foo          nine                (01:00)
 wtmp begins Wed Aug 28 03:00:00 2013
 ~~~ iso-8601 time ~~~
 rick     long         never-gonna-logout 1970-01-01T00:00:00+0000 - 2038-01-19T03:14:07+0000 (24855+03:14)
-torvalds linux        hobby            1991-08-26T00:57:08+0000   still logged in          
+torvalds linux        hobby            1991-08-26T00:57:08+0000   still logged in
 reboot   system boot  system-name      2013-08-28T18:00:00+0000 - 2013-08-28T18:50:27+0000  (00:50)
 reboot   system boot  system-name      2013-08-28T16:00:00+0000 - 2013-08-28T17:00:00+0000  (01:00)
 IPv4     root         dns-server       2013-08-28T13:00:00+0000 - 2013-08-28T14:00:00+0000  (01:00)