scriptreplay: cleanup usage()

[thirdparty/util-linux.git] / login-utils / last.c

diff --git a/login-utils/last.c b/login-utils/last.c
index 303adeacd8988255ebf1275cf40de0d4bdd8561f..20d69e9b581db2e6db835ecd247dfcdeca8a727a 100644 (file)
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -394,8 +394,7 @@ static int list(const struct last_control *ctl, struct utmpx *p, time_t logout_t
        /*
         *      uucp and ftp have special-type entries
         */
-       utline[0] = 0;
-       strncat(utline, p->ut_line, sizeof(utline) - 1);
+       mem2strcpy(utline, p->ut_line, sizeof(p->ut_line), sizeof(utline));
        if (strncmp(utline, "ftp", 3) == 0 && isdigit(utline[3]))
                utline[3] = 0;
        if (strncmp(utline, "uucp", 4) == 0 && isdigit(utline[4]))
@@ -458,7 +457,7 @@ static int list(const struct last_control *ctl, struct utmpx *p, time_t logout_t
        } else if (hours) {
                sprintf(length, " (%02d:%02d)", hours, abs(mins));  /* mins always shown as positive (w/o minus sign!) even if secs < 0 */
        } else if (secs >= 0) {
-               sprintf(length, " (%02d:%02d)", hours, mins); 
+               sprintf(length, " (%02d:%02d)", hours, mins);
        } else {
                sprintf(length, " (-00:%02d)", abs(mins));  /* mins always shown as positive (w/o minus sign!) even if secs < 0 */
        }
@@ -939,7 +938,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
        /*
         * Which file do we want to read?
         */
@@ -954,8 +953,7 @@ int main(int argc, char **argv)
                        usage(&ctl);
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'R':
                        ctl.showhost = 0;
                        break;