Index: head/usr.bin/last/Makefile =================================================================== --- head/usr.bin/last/Makefile (revision 338351) +++ head/usr.bin/last/Makefile (revision 338352) @@ -1,8 +1,9 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ PROG= last +LIBADD= xo NO_WFORMAT= .include Index: head/usr.bin/last/last.1 =================================================================== --- head/usr.bin/last/last.1 (revision 338351) +++ head/usr.bin/last/last.1 (revision 338352) @@ -1,221 +1,235 @@ .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)last.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd June 1, 2018 +.Dd August 28, 2018 .Dt LAST 1 .Os .Sh NAME .Nm last .Nd indicate last logins of users and ttys .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl swy .Oo .Fl d .Sm off .Op Oo Ar CC Oc Ar YY .Op Ar MM DD .Ar hh mm .Op Ar .SS .Sm on .Oc .Op Fl f Ar file .Op Fl h Ar host .Op Fl n Ar maxrec .Op Fl t Ar tty .Op Ar user ... .Sh DESCRIPTION The .Nm utility will either list the sessions of specified .Ar users , .Ar ttys , and .Ar hosts , in reverse time order, or list the users logged in at a specified date and time. Each line of output contains the user name, the tty from which the session was conducted, any hostname, the start and stop times for the session, and the duration of the session. If the session is still continuing or was cut short by a crash or shutdown, .Nm will so indicate. .Pp The following options are available: .Bl -tag -width indent-two +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_parse_args 3 +for details on command line arguments. .It Fl d Ar date Specify the snapshot date and time. All users logged in at the snapshot date and time will be reported. This may be used with the .Fl f option to derive the results from stored .Pa utx.log files. When this argument is provided, all other options except for .Fl f and .Fl n are ignored. The argument should be in the form .Sm off .Op Oo Ar CC Oc Ar YY .Op Ar MM DD .Ar hh mm .Op Ar .SS .Sm on where each pair of letters represents the following: .Pp .Bl -tag -width Ds -compact -offset indent .It Ar CC The first two digits of the year (the century). .It Ar YY The second two digits of the year. If .Ar YY is specified, but .Ar CC is not, a value for .Ar YY between 69 and 99 results in a .Ar CC value of 19. Otherwise, a .Ar CC value of 20 is used. .It Ar MM Month of the year, from 1 to 12. .It Ar DD Day of the month, from 1 to 31. .It Ar hh Hour of the day, from 0 to 23. .It Ar mm Minute of the hour, from 0 to 59. .It Ar SS Second of the minute, from 0 to 60. .El .Pp If the .Ar CC and .Ar YY letter pairs are not specified, the values default to the current year. If the .Ar SS letter pair is not specified, the value defaults to 0. .It Fl f Ar file Read the file .Ar file instead of the default, .Pa /var/log/utx.log . .It Fl h Ar host .Ar Host names may be names or internet numbers. .It Fl n Ar maxrec Limit the report to .Ar maxrec lines. .It Fl s Report the duration of the login session in seconds, instead of the default days, hours and minutes. .It Fl t Ar tty Specify the .Ar tty . Tty names may be given fully or abbreviated, for example, .Dq Li "last -t 03" is equivalent to .Dq Li "last -t tty03" . .It Fl w Widen the duration field to show seconds, as well as the default days, hours and minutes. .It Fl y Report the year in the session start time. .El .Pp If multiple arguments are given, and a snapshot time is not specified, the information which applies to any of the arguments is printed, e.g., .Dq Li "last root -t console" would list all of .Dq Li root Ns 's sessions as well as all sessions on the console terminal. If no users, hostnames or terminals are specified, .Nm prints a record of all logins and logouts. .Pp The pseudo-user .Ar reboot logs in at reboots of the system, thus .Dq Li last reboot will give an indication of mean time between reboot. .Pp If .Nm is interrupted, it indicates to what date the search has progressed. If interrupted with a quit signal .Nm indicates how far the search has progressed and then continues. .Sh FILES .Bl -tag -width /var/log/utx.log -compact .It Pa /var/log/utx.log login data base .El .Sh SEE ALSO .Xr lastcomm 1 , .Xr getutxent 3 , .Xr ac 8 , .Xr lastlogin 8 +.Xr libxo 3 , +.Xr xo_parse_args 3 .Sh HISTORY .Nm utility first appeared in .Bx 1 . .Sh AUTHORS .An -nosplit The original version was written by .An Howard P. Katseff ; .An Keith Bostic rewrote it in 1986/87 to add functionality and to improve code quality. +.An Philip Paeps +added +.Xr libxo 3 +support in August 2018. .Sh BUGS If a login shell should terminate abnormally for some reason, it is likely that a logout record will not be written to the .Pa utx.log file. In this case, .Nm will indicate the logout time as "shutdown". Index: head/usr.bin/last/last.c =================================================================== --- head/usr.bin/last/last.c (revision 338351) +++ head/usr.bin/last/last.c (revision 338352) @@ -1,573 +1,596 @@ /* * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. + * Copyright (c) 2018 Philip Paeps * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1987, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint static const char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94"; #endif /* not lint */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include +#include + #define NO 0 /* false/no */ #define YES 1 /* true/yes */ #define ATOI2(ar) ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2; typedef struct arg { char *name; /* argument */ #define REBOOT_TYPE -1 #define HOST_TYPE -2 #define TTY_TYPE -3 #define USER_TYPE -4 int type; /* type of arg */ struct arg *next; /* linked list pointer */ } ARG; static ARG *arglist; /* head of linked list */ static SLIST_HEAD(, idtab) idlist; struct idtab { time_t logout; /* log out time */ char id[sizeof ((struct utmpx *)0)->ut_id]; /* identifier */ SLIST_ENTRY(idtab) list; }; static const char *crmsg; /* cause of last reboot */ static time_t currentout; /* current logout value */ static long maxrec; /* records to display */ static const char *file = NULL; /* utx.log file */ static int sflag = 0; /* show delta in seconds */ static int width = 5; /* show seconds in delta */ static int yflag; /* show year */ static int d_first; static int snapfound = 0; /* found snapshot entry? */ static time_t snaptime; /* if != 0, we will only * report users logged in * at this snapshot time */ static void addarg(int, char *); static time_t dateconv(char *); static void doentry(struct utmpx *); static void hostconv(char *); static void printentry(struct utmpx *, struct idtab *); static char *ttyconv(char *); static int want(struct utmpx *); static void usage(void); static void wtmp(void); static void usage(void) { - (void)fprintf(stderr, + xo_error( "usage: last [-swy] [-d [[CC]YY][MMDD]hhmm[.SS]] [-f file] [-h host]\n" " [-n maxrec] [-t tty] [user ...]\n"); exit(1); } int main(int argc, char *argv[]) { int ch; char *p; (void) setlocale(LC_TIME, ""); d_first = (*nl_langinfo(D_MD_ORDER) == 'd'); + argc = xo_parse_args(argc, argv); + if (argc < 0) + exit(1); + atexit(xo_finish_atexit); + maxrec = -1; snaptime = 0; while ((ch = getopt(argc, argv, "0123456789d:f:h:n:st:wy")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* * kludge: last was originally designed to take * a number after a dash. */ if (maxrec == -1) { p = strchr(argv[optind - 1], ch); if (p == NULL) p = strchr(argv[optind], ch); maxrec = atol(p); if (!maxrec) exit(0); } break; case 'd': snaptime = dateconv(optarg); break; case 'f': file = optarg; break; case 'h': hostconv(optarg); addarg(HOST_TYPE, optarg); break; case 'n': errno = 0; maxrec = strtol(optarg, &p, 10); if (p == optarg || *p != '\0' || errno != 0 || maxrec <= 0) - errx(1, "%s: bad line count", optarg); + xo_errx(1, "%s: bad line count", optarg); break; case 's': sflag++; /* Show delta as seconds */ break; case 't': addarg(TTY_TYPE, ttyconv(optarg)); break; case 'w': width = 8; break; case 'y': yflag++; break; case '?': default: usage(); } if (caph_limit_stdio() < 0) - err(1, "can't limit stdio rights"); + xo_err(1, "can't limit stdio rights"); caph_cache_catpages(); caph_cache_tzdata(); /* Cache UTX database. */ if (setutxdb(UTXDB_LOG, file) != 0) - err(1, "%s", file != NULL ? file : "(default utx db)"); + xo_err(1, "%s", file != NULL ? file : "(default utx db)"); if (caph_enter() < 0) - err(1, "cap_enter"); + xo_err(1, "cap_enter"); if (sflag && width == 8) usage(); if (argc) { setlinebuf(stdout); for (argv += optind; *argv; ++argv) { if (strcmp(*argv, "reboot") == 0) addarg(REBOOT_TYPE, *argv); #define COMPATIBILITY #ifdef COMPATIBILITY /* code to allow "last p5" to work */ addarg(TTY_TYPE, ttyconv(*argv)); #endif addarg(USER_TYPE, *argv); } } wtmp(); exit(0); } /* * wtmp -- * read through the utx.log file */ static void wtmp(void) { struct utmpx *buf = NULL; struct utmpx *ut; static unsigned int amount = 0; time_t t; char ct[80]; struct tm *tm; SLIST_INIT(&idlist); (void)time(&t); + xo_open_container("last-information"); + /* Load the last entries from the file. */ while ((ut = getutxent()) != NULL) { if (amount % 128 == 0) { buf = realloc(buf, (amount + 128) * sizeof *ut); if (buf == NULL) - err(1, "realloc"); + xo_err(1, "realloc"); } memcpy(&buf[amount++], ut, sizeof *ut); if (t > ut->ut_tv.tv_sec) t = ut->ut_tv.tv_sec; } endutxent(); /* Display them in reverse order. */ + xo_open_list("last"); while (amount > 0) doentry(&buf[--amount]); + xo_close_list("last"); free(buf); tm = localtime(&t); (void) strftime(ct, sizeof(ct), "%+", tm); - printf("\n%s begins %s\n", ((file == NULL) ? "utx.log" : file), ct); + xo_emit("\n{:utxdb/%s}", (file == NULL) ? "utx.log" : file); + xo_attr("seconds", "%lu", (unsigned long) t); + xo_emit(" begins {:begins/%s}\n", ct); + xo_close_container("last-information"); } /* * doentry -- * process a single utx.log entry */ static void doentry(struct utmpx *bp) { struct idtab *tt; /* the machine stopped */ if (bp->ut_type == BOOT_TIME || bp->ut_type == SHUTDOWN_TIME) { /* everybody just logged out */ while ((tt = SLIST_FIRST(&idlist)) != NULL) { SLIST_REMOVE_HEAD(&idlist, list); free(tt); } currentout = -bp->ut_tv.tv_sec; crmsg = bp->ut_type != SHUTDOWN_TIME ? "crash" : "shutdown"; /* * if we're in snapshot mode, we want to exit if this * shutdown/reboot appears while we we are tracking the * active range */ if (snaptime && snapfound) exit(0); /* * don't print shutdown/reboot entries unless flagged for */ if (!snaptime && want(bp)) printentry(bp, NULL); return; } /* date got set */ if (bp->ut_type == OLD_TIME || bp->ut_type == NEW_TIME) { if (want(bp) && !snaptime) printentry(bp, NULL); return; } if (bp->ut_type != USER_PROCESS && bp->ut_type != DEAD_PROCESS) return; /* find associated identifier */ SLIST_FOREACH(tt, &idlist, list) if (!memcmp(tt->id, bp->ut_id, sizeof bp->ut_id)) break; if (tt == NULL) { /* add new one */ tt = malloc(sizeof(struct idtab)); if (tt == NULL) - errx(1, "malloc failure"); + xo_errx(1, "malloc failure"); tt->logout = currentout; memcpy(tt->id, bp->ut_id, sizeof bp->ut_id); SLIST_INSERT_HEAD(&idlist, tt, list); } /* * print record if not in snapshot mode and wanted * or in snapshot mode and in snapshot range */ if (bp->ut_type == USER_PROCESS && (want(bp) || (bp->ut_tv.tv_sec < snaptime && (tt->logout > snaptime || tt->logout < 1)))) { snapfound = 1; printentry(bp, tt); } tt->logout = bp->ut_tv.tv_sec; } /* * printentry -- * output an entry * * If `tt' is non-NULL, use it and `crmsg' to print the logout time or * logout type (crash/shutdown) as appropriate. */ static void printentry(struct utmpx *bp, struct idtab *tt) { char ct[80]; struct tm *tm; time_t delta; /* time difference */ time_t t; if (maxrec != -1 && !maxrec--) exit(0); + xo_open_instance("last"); t = bp->ut_tv.tv_sec; tm = localtime(&t); (void) strftime(ct, sizeof(ct), d_first ? (yflag ? "%a %e %b %Y %R" : "%a %e %b %R") : (yflag ? "%a %b %e %Y %R" : "%a %b %e %R"), tm); switch (bp->ut_type) { case BOOT_TIME: - printf("%-42s", "boot time"); + xo_emit("{:user/%-42s/%s}", "boot time"); break; case SHUTDOWN_TIME: - printf("%-42s", "shutdown time"); + xo_emit("{:user/%-42s/%s}", "shutdown time"); break; case OLD_TIME: - printf("%-42s", "old time"); + xo_emit("{:user/%-42s/%s}", "old time"); break; case NEW_TIME: - printf("%-42s", "new time"); + xo_emit("{:user/%-42s/%s}", "new time"); break; case USER_PROCESS: - printf("%-10s %-8s %-22.22s", + xo_emit("{:user/%-10s/%s} {:tty/%-8s/%s} {:from/%-22.22s/%s}", bp->ut_user, bp->ut_line, bp->ut_host); break; } - printf(" %s%c", ct, tt == NULL ? '\n' : ' '); + xo_attr("seconds", "%lu", (unsigned long)t); + xo_emit(" {:login-time/%s%c/%s}", ct, tt == NULL ? '\n' : ' '); if (tt == NULL) - return; + goto end; if (!tt->logout) { - puts(" still logged in"); - return; + xo_emit(" {:logout-time/still logged in}\n"); + goto end; } if (tt->logout < 0) { tt->logout = -tt->logout; - printf("- %s", crmsg); + xo_emit("- {:logout-reason/%s}", crmsg); } else { tm = localtime(&tt->logout); (void) strftime(ct, sizeof(ct), "%R", tm); - printf("- %s", ct); + xo_attr("seconds", "%lu", (unsigned long)tt->logout); + xo_emit("- {:logout-time/%s}", ct); } delta = tt->logout - bp->ut_tv.tv_sec; + xo_attr("seconds", "%ld", (long)delta); if (sflag) { - printf(" (%8ld)\n", (long)delta); + xo_emit(" ({:session-length/%8ld})\n", (long)delta); } else { tm = gmtime(&delta); (void) strftime(ct, sizeof(ct), width >= 8 ? "%T" : "%R", tm); if (delta < 86400) - printf(" (%s)\n", ct); + xo_emit(" ({:session-length/%s})\n", ct); else - printf(" (%ld+%s)\n", (long)delta / 86400, ct); + xo_emit(" ({:session-length/%ld+%s})\n", + (long)delta / 86400, ct); } + +end: + xo_close_instance("last"); } /* * want -- * see if want this entry */ static int want(struct utmpx *bp) { ARG *step; if (snaptime) return (NO); if (!arglist) return (YES); for (step = arglist; step; step = step->next) switch(step->type) { case REBOOT_TYPE: if (bp->ut_type == BOOT_TIME || bp->ut_type == SHUTDOWN_TIME) return (YES); break; case HOST_TYPE: if (!strcasecmp(step->name, bp->ut_host)) return (YES); break; case TTY_TYPE: if (!strcmp(step->name, bp->ut_line)) return (YES); break; case USER_TYPE: if (!strcmp(step->name, bp->ut_user)) return (YES); break; } return (NO); } /* * addarg -- * add an entry to a linked list of arguments */ static void addarg(int type, char *arg) { ARG *cur; if ((cur = malloc(sizeof(ARG))) == NULL) - errx(1, "malloc failure"); + xo_errx(1, "malloc failure"); cur->next = arglist; cur->type = type; cur->name = arg; arglist = cur; } /* * hostconv -- * convert the hostname to search pattern; if the supplied host name * has a domain attached that is the same as the current domain, rip * off the domain suffix since that's what login(1) does. */ static void hostconv(char *arg) { static int first = 1; static char *hostdot, name[MAXHOSTNAMELEN]; char *argdot; if (!(argdot = strchr(arg, '.'))) return; if (first) { first = 0; if (gethostname(name, sizeof(name))) - err(1, "gethostname"); + xo_err(1, "gethostname"); hostdot = strchr(name, '.'); } if (hostdot && !strcasecmp(hostdot, argdot)) *argdot = '\0'; } /* * ttyconv -- * convert tty to correct name. */ static char * ttyconv(char *arg) { char *mval; /* * kludge -- we assume that all tty's end with * a two character suffix. */ if (strlen(arg) == 2) { /* either 6 for "ttyxx" or 8 for "console" */ if ((mval = malloc(8)) == NULL) - errx(1, "malloc failure"); + xo_errx(1, "malloc failure"); if (!strcmp(arg, "co")) (void)strcpy(mval, "console"); else { (void)strcpy(mval, "tty"); (void)strcpy(mval + 3, arg); } return (mval); } if (!strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1)) return (arg + 5); return (arg); } /* * dateconv -- * Convert the snapshot time in command line given in the format * [[CC]YY]MMDDhhmm[.SS]] to a time_t. * Derived from atime_arg1() in usr.bin/touch/touch.c */ static time_t dateconv(char *arg) { time_t timet; struct tm *t; int yearset; char *p; /* Start with the current time. */ if (time(&timet) < 0) - err(1, "time"); + xo_err(1, "time"); if ((t = localtime(&timet)) == NULL) - err(1, "localtime"); + xo_err(1, "localtime"); /* [[CC]YY]MMDDhhmm[.SS] */ if ((p = strchr(arg, '.')) == NULL) t->tm_sec = 0; /* Seconds defaults to 0. */ else { if (strlen(p + 1) != 2) goto terr; *p++ = '\0'; t->tm_sec = ATOI2(p); } yearset = 0; switch (strlen(arg)) { case 12: /* CCYYMMDDhhmm */ t->tm_year = ATOI2(arg); t->tm_year *= 100; yearset = 1; /* FALLTHROUGH */ case 10: /* YYMMDDhhmm */ if (yearset) { yearset = ATOI2(arg); t->tm_year += yearset; } else { yearset = ATOI2(arg); if (yearset < 69) t->tm_year = yearset + 2000; else t->tm_year = yearset + 1900; } t->tm_year -= 1900; /* Convert to UNIX time. */ /* FALLTHROUGH */ case 8: /* MMDDhhmm */ t->tm_mon = ATOI2(arg); --t->tm_mon; /* Convert from 01-12 to 00-11 */ t->tm_mday = ATOI2(arg); t->tm_hour = ATOI2(arg); t->tm_min = ATOI2(arg); break; case 4: /* hhmm */ t->tm_hour = ATOI2(arg); t->tm_min = ATOI2(arg); break; default: goto terr; } t->tm_isdst = -1; /* Figure out DST. */ timet = mktime(t); if (timet == -1) -terr: errx(1, +terr: xo_errx(1, "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]"); return timet; }