last: use carefulput() for printable character output

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

diff --git a/login-utils/last.c b/login-utils/last.c
index 0f475f2cfd6958c2b2796d589747fb0dabd92871..f08632bbf010449e17046790b858f4b0a47349e6 100644 (file)
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -45,6 +45,7 @@
 #include "pathnames.h"
 #include "xalloc.h"
 #include "closestream.h"
+#include "carefulputc.h"
 
 #ifndef SHUTDOWN_TIME
 # define SHUTDOWN_TIME 254
@@ -396,12 +397,8 @@ static int list(struct utmp *p, time_t t, int what)
        /*
         *      Print out "final" string safely.
         */
-       for (s = final; *s; s++) {
-               if (*s == '\n' || (*s >= 32 && (unsigned char)*s <= 126))
-                       putchar(*s);
-               else
-                       putchar('*');
-       }
+       for (s = final; *s; s++)
+               carefulputc(*s, stdout, '*');
 
        if (len < 0 || (size_t)len >= sizeof(final))
                putchar('\n');