diff --git a/contrib/ts/ts.1 b/contrib/ts/ts.1 new file mode 100644 index 000000000000..3406bdae9bab --- /dev/null +++ b/contrib/ts/ts.1 @@ -0,0 +1,112 @@ +.\" $OpenBSD: ts.1,v 1.6 2022/06/30 21:40:41 jmc Exp $ +.\" +.\" Copyright (c) 2022 Job Snijders +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.Dd June 30, 2022 +.Dt TS 1 +.Os +.Sh NAME +.Nm ts +.Nd timestamp input +.Sh SYNOPSIS +.Nm +.Op Fl i | s +.Op Fl m +.Op Ar format +.Sh DESCRIPTION +The +.Nm +utility prepends a timestamp to each line of standard input and writes +it to standard output. +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl i +Display time elapsed since the last timestamp. +.It Fl m +Display timestamps derived from a strictly linearly increasing clock. +Without +.Fl m , +timestamps reflect the current date and time, including time jumps if the +system time is changed. +.It Fl s +Display time elapsed since the start of the program. +.El +.Pp +The optional +.Ar format +argument controls how the timestamp is displayed, according to the conversion +specifications described in the +.Xr strftime 3 +manual page. +The default format is +.Qq %b %d %H:%M:%S ; +or +.Qq %H:%M:%S +if one of the +.Fl i +or +.Fl s +options is used. +.Pp +Some additional conversion specifications are also supported +to append microsecond resolution: +.Cm %.S , +.Cm %.s , +and +.Cm %.T ; +which are similar to +.Cm %S , +.Cm %s , +and +.Cm \&%T . +Examples: +.Qq 10.00001 , +.Qq 1656427781.00001 , +and +.Qq 4:20:00.00001 . +.Sh EXAMPLES +.Bd -literal -offset indent +$ (echo foo; sleep 2; echo bar) | ts +Jun 28 12:13:38 foo +Jun 28 12:13:40 bar + +$ ls | ts -i %.S +00.000452 CVS +00.000595 Makefile +00.000004 ts.1 +00.000004 ts.c +.Ed +.Sh SEE ALSO +.Xr strftime 3 +.Sh HISTORY +A +.Nm +utility first appeared in the moreutils collection by Joey Hess, and was +rewritten from scratch for +.Ox 7.2 . +.Pp +It was imported to +.Fx +by +.An -nosplit +.An Juraj Lutter Aq Mt otis@FreeBSD.org . +.Sh AUTHORS +This +.Nm +utility was written by +.An Job Snijders Aq Mt job@openbsd.org +and +.An Claudio Jeker Aq Mt claudio@openbsd.org . diff --git a/contrib/ts/ts.c b/contrib/ts/ts.c new file mode 100644 index 000000000000..f20826176229 --- /dev/null +++ b/contrib/ts/ts.c @@ -0,0 +1,171 @@ +/* $OpenBSD: ts.c,v 1.7 2022/07/06 07:59:03 claudio Exp $ */ +/* + * Copyright (c) 2022 Job Snijders + * Copyright (c) 2022 Claudio Jeker + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +static const char *format = "%b %d %H:%M:%S"; +static char *buf; +static char *outbuf; +static size_t bufsize; + +static void fmtfmt(const struct timespec *); +static void __dead2 usage(void); + +int +main(int argc, char *argv[]) +{ + int iflag, mflag, sflag; + int ch, prev; + struct timespec start, now, utc_offset, ts; + clockid_t clock = CLOCK_REALTIME; + + iflag = mflag = sflag = 0; + + while ((ch = getopt(argc, argv, "ims")) != -1) { + switch (ch) { + case 'i': + iflag = 1; + format = "%H:%M:%S"; + clock = CLOCK_MONOTONIC; + break; + case 'm': + mflag = 1; + clock = CLOCK_MONOTONIC; + break; + case 's': + sflag = 1; + format = "%H:%M:%S"; + clock = CLOCK_MONOTONIC; + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if ((iflag && sflag) || argc > 1) + usage(); + + if (argc == 1) + format = *argv; + + bufsize = strlen(format); + if (bufsize > SIZE_MAX / 10) + errx(1, "format string too big"); + + bufsize *= 10; + if ((buf = calloc(1, bufsize)) == NULL) + err(1, NULL); + if ((outbuf = calloc(1, bufsize)) == NULL) + err(1, NULL); + + /* force UTC for interval calculations */ + if (iflag || sflag) + if (setenv("TZ", "UTC", 1) == -1) + err(1, "setenv UTC"); + + clock_gettime(clock, &start); + clock_gettime(CLOCK_REALTIME, &utc_offset); + timespecsub(&utc_offset, &start, &utc_offset); + + for (prev = '\n'; (ch = getchar()) != EOF; prev = ch) { + if (prev == '\n') { + clock_gettime(clock, &now); + if (iflag || sflag) + timespecsub(&now, &start, &ts); + else if (mflag) + timespecadd(&now, &utc_offset, &ts); + else + ts = now; + fmtfmt(&ts); + if (iflag) + start = now; + } + if (putchar(ch) == EOF) + break; + } + + if (fclose(stdout)) + err(1, "stdout"); + return 0; +} + +static void __dead2 +usage(void) +{ + fprintf(stderr, "usage: %s [-i | -s] [-m] [format]\n", getprogname()); + exit(1); +} + +/* + * yo dawg, i heard you like format strings + * so i put format strings in your user supplied input + * so you can format while you format + */ +static void +fmtfmt(const struct timespec *ts) +{ + struct tm *tm; + char *f, us[7]; + + if ((tm = localtime(&ts->tv_sec)) == NULL) + err(1, "localtime"); + + snprintf(us, sizeof(us), "%06ld", ts->tv_nsec / 1000); + strlcpy(buf, format, bufsize); + f = buf; + + do { + while ((f = strchr(f, '%')) != NULL && f[1] == '%') + f += 2; + + if (f == NULL) + break; + + f++; + if (f[0] == '.' && + (f[1] == 'S' || f[1] == 's' || f[1] == 'T')) { + size_t l; + + f[0] = f[1]; + f[1] = '.'; + f += 2; + l = strlen(f); + memmove(f + 6, f, l + 1); + memcpy(f, us, 6); + f += 6; + } + } while (*f != '\0'); + + if (strftime(outbuf, bufsize, buf, tm) == 0) + errx(1, "strftime"); + + fprintf(stdout, "%s ", outbuf); + if (ferror(stdout)) + exit(1); +} diff --git a/usr.bin/Makefile b/usr.bin/Makefile index e99670ec2d3e..787cbc0cbd78 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,286 +1,287 @@ .include SUBDIR= alias \ apply \ asa \ awk \ backlight \ banner \ basename \ beep \ bintrans \ brandelf \ bsdcat \ bsddialog \ bsdiff \ bzip2 \ bzip2recover \ cap_mkdb \ chat \ chpass \ cksum \ cmp \ col \ colrm \ column \ comm \ compress \ csplit \ ctlstat \ cut \ diff \ dirname \ dtc \ du \ elfctl \ elfdump \ enigma \ env \ etdump \ expand \ false \ fetch \ find \ fmt \ fold \ fstat \ fsync \ gcore \ gencat \ getaddrinfo \ getconf \ getent \ getopt \ grep \ gzip \ head \ hexdump \ id \ ident \ ipcrm \ ipcs \ join \ jot \ killall \ ktrace \ ktrdump \ lam \ ldd \ leave \ less \ lessecho \ lesskey \ limits \ locale \ localedef \ lock \ lockf \ logger \ login \ logins \ logname \ look \ lsvfs \ lzmainfo \ m4 \ mandoc \ mdo \ mesg \ mididump \ ministat \ mkdep \ mkfifo \ mkimg \ mktemp \ mkuzip \ mt \ ncal \ ncurses \ netstat \ newgrp \ nfsstat \ nice \ nl \ nohup \ pagesize \ passwd \ paste \ patch \ pathchk \ perror \ posixmqcontrol \ posixshmcontrol \ pr \ printenv \ printf \ proccontrol \ procstat \ protect \ rctl \ renice \ resizewin \ rev \ revoke \ rpcinfo \ rs \ runat \ rup \ ruptime \ rusers \ rwall \ rwho \ script \ sdiff \ sed \ seq \ shar \ showmount \ sockstat \ soelim \ sort \ split \ stat \ stdbuf \ strings \ su \ systat \ tail \ tar \ tcopy \ tee \ time \ tip \ top \ touch \ tr \ true \ truncate \ + ts \ tsort \ tty \ uname \ unexpand \ uniq \ unzip \ units \ unvis \ vis \ vmstat \ w \ wall \ wc \ wg \ what \ whereis \ which \ whois \ write \ xargs \ xinstall \ xo \ xz \ xzdec \ yes \ zstd # NB: keep these sorted by MK_* knobs SUBDIR.${MK_ACCT}+= lastcomm SUBDIR.${MK_AT}+= at SUBDIR.${MK_BLUETOOTH}+= bluetooth SUBDIR.${MK_BSD_CPIO}+= cpio SUBDIR.${MK_CALENDAR}+= calendar .if ${MK_CLANG} != "no" || ${MK_LLVM_BINUTILS} != "no" || \ ${MK_LLD} != "no" || ${MK_LLDB} != "no" SUBDIR+= clang .endif SUBDIR.${MK_DIALOG}+= dpv SUBDIR.${MK_EE}+= ee SUBDIR.${MK_FILE}+= file SUBDIR.${MK_FINGER}+= finger SUBDIR.${MK_FTP}+= ftp SUBDIR.${MK_GAMES}+= caesar SUBDIR.${MK_GAMES}+= factor SUBDIR.${MK_GAMES}+= fortune SUBDIR.${MK_GAMES}+= grdc SUBDIR.${MK_GAMES}+= morse SUBDIR.${MK_GAMES}+= number SUBDIR.${MK_GAMES}+= pom SUBDIR.${MK_GAMES}+= primes SUBDIR.${MK_GAMES}+= random SUBDIR+= gh-bc .if ${MK_GNU_DIFF} == "no" SUBDIR+= diff3 .endif SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper SUBDIR.${MK_ICONV}+= mkesdb SUBDIR.${MK_ISCSI}+= iscsictl SUBDIR.${MK_KDUMP}+= kdump SUBDIR.${MK_KDUMP}+= truss SUBDIR.${MK_KERBEROS_SUPPORT}+= compile_et SUBDIR.${MK_LDNS_UTILS}+= drill SUBDIR.${MK_LDNS_UTILS}+= host SUBDIR.${MK_LIB32}+= ldd32 SUBDIR.${MK_LOCATE}+= locate # XXX msgs? SUBDIR.${MK_MAIL}+= biff SUBDIR.${MK_MAIL}+= from SUBDIR.${MK_MAIL}+= mail SUBDIR.${MK_MAIL}+= msgs SUBDIR.${MK_MAKE}+= bmake SUBDIR.${MK_MAN_UTILS}+= man SUBDIR.${MK_NETCAT}+= nc SUBDIR.${MK_NETLINK}+= genl SUBDIR.${MK_NIS}+= ypcat SUBDIR.${MK_NIS}+= ypmatch SUBDIR.${MK_NIS}+= ypwhich SUBDIR.${MK_OPENSSH}+= ssh-copy-id SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_SENDMAIL}+= vacation SUBDIR.${MK_TALK}+= talk SUBDIR.${MK_TELNET}+= telnet SUBDIR.${MK_TESTS_SUPPORT}+= kyua SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TEXTPROC}+= ul SUBDIR.${MK_TFTP}+= tftp .if ${MK_LLVM_BINUTILS} == "no" # Only build the elftoolchain tools if we aren't using the LLVM ones. SUBDIR.${MK_TOOLCHAIN}+= addr2line SUBDIR.${MK_TOOLCHAIN}+= ar SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size .endif SUBDIR.${MK_TOOLCHAIN}+= c89 SUBDIR.${MK_TOOLCHAIN}+= c99 SUBDIR.${MK_TOOLCHAIN}+= ctags .if ${MK_LLVM_CXXFILT} == "no" SUBDIR.${MK_TOOLCHAIN}+= cxxfilt .endif # ELF Tool Chain elfcopy required for EFI objects (PR280771) SUBDIR.${MK_TOOLCHAIN}+= elfcopy SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef SUBDIR.${MK_TOOLCHAIN}+= xstr SUBDIR.${MK_TOOLCHAIN}+= yacc SUBDIR.${MK_VI}+= vi SUBDIR.${MK_VT}+= vtfontcvt SUBDIR.${MK_USB}+= usbhidaction SUBDIR.${MK_USB}+= usbhidctl SUBDIR.${MK_UTMPX}+= last SUBDIR.${MK_UTMPX}+= users SUBDIR.${MK_UTMPX}+= who SUBDIR.${MK_OFED}+= ofed .include SUBDIR_PARALLEL= .include diff --git a/usr.bin/ts/Makefile b/usr.bin/ts/Makefile new file mode 100644 index 000000000000..4a74927fcede --- /dev/null +++ b/usr.bin/ts/Makefile @@ -0,0 +1,7 @@ +.PATH: ${SRCTOP}/contrib/ts + +PROG= ts +SRCS= ts.c +MAN= ts.1 + +.include