diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index 42c70804f..fcda4d373 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gen_subs.c,v 1.32 2016/08/26 05:06:14 guenther Exp $ */ +/* $OpenBSD: gen_subs.c,v 1.34 2024/04/27 19:49:42 florian Exp $ */ /* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */ /*- @@ -75,6 +75,7 @@ void ls_list(ARCHD *arcn, time_t now, FILE *fp) { struct stat *sbp; + struct tm *tm; char f_mode[MODELEN]; char f_date[DATELEN]; int term; @@ -103,8 +104,10 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp) /* * print file mode, link count, uid, gid and time */ - if (strftime(f_date, sizeof(f_date), TIMEFMT(sbp->st_mtime, now), - localtime(&(sbp->st_mtime))) == 0) + if ((tm = localtime(&(sbp->st_mtime))) == NULL) + f_date[0] = '\0'; + else if (strftime(f_date, sizeof(f_date), TIMEFMT(sbp->st_mtime, now), + tm) == 0) f_date[0] = '\0'; (void)fprintf(fp, "%s%2u %-*.*s %-*.*s ", f_mode, sbp->st_nlink, NAME_WIDTH, UT_NAMESIZE, user_from_uid(sbp->st_uid, 0), @@ -146,6 +149,7 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp) void ls_tty(ARCHD *arcn) { + struct tm *tm; char f_date[DATELEN]; char f_mode[MODELEN]; time_t now = time(NULL); @@ -153,8 +157,10 @@ ls_tty(ARCHD *arcn) /* * convert time to string, and print */ - if (strftime(f_date, DATELEN, TIMEFMT(arcn->sb.st_mtime, now), - localtime(&(arcn->sb.st_mtime))) == 0) + if ((tm = localtime(&(arcn->sb.st_mtime))) == NULL) + f_date[0] = '\0'; + else if (strftime(f_date, DATELEN, TIMEFMT(arcn->sb.st_mtime, now), + tm) == 0) f_date[0] = '\0'; strmode(arcn->sb.st_mode, f_mode); tty_prnt("%s%s %s\n", f_mode, f_date, arcn->name); diff --git a/lib/libcrypto/man/EC_GROUP_new.3 b/lib/libcrypto/man/EC_GROUP_new.3 index d0e95c985..e6cfb9a73 100644 --- a/lib/libcrypto/man/EC_GROUP_new.3 +++ b/lib/libcrypto/man/EC_GROUP_new.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EC_GROUP_new.3,v 1.16 2024/04/26 14:23:03 tb Exp $ +.\" $OpenBSD: EC_GROUP_new.3,v 1.17 2024/04/27 07:41:47 tb Exp $ .\" OpenSSL 6328d367 Sat Jul 4 21:58:30 2020 +0200 .\" .\" This file was written by Matt Caswell . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 26 2024 $ +.Dd $Mdocdate: April 27 2024 $ .Dt EC_GROUP_NEW 3 .Os .Sh NAME @@ -138,8 +138,13 @@ .Fc .Sh DESCRIPTION The EC library provides functions for performing operations on -elliptic curves over finite fields. -In general, an elliptic curve satisfies an equation of the form: +elliptic curves in Weierstrass form. +Such curves are defined over the prime field of order +.Fa p +and satisfy the Weierstrass equation with coefficients +.Fa a +and +.Fa b .Pp .Dl y^2 = x^3 + ax + b .Pp diff --git a/usr.bin/less/less.hlp b/usr.bin/less/less.hlp index 8bcae610d..707e896dd 100644 --- a/usr.bin/less/less.hlp +++ b/usr.bin/less/less.hlp @@ -95,8 +95,6 @@ __<_f_l_a_g_> Display the setting of a command line option. ___<_n_a_m_e_> Display the setting of an option, by name. +_c_m_d Execute the less cmd each time a new file is examined. - - !_c_o_m_m_a_n_d Execute the shell command with $SHELL. |XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command. v Edit the current file with $VISUAL or $EDITOR. V Print version number of "less". diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile index 7b261e36c..5e057a01c 100644 --- a/usr.bin/tput/Makefile +++ b/usr.bin/tput/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2023/10/17 09:52:11 nicm Exp $ +# $OpenBSD: Makefile,v 1.14 2024/04/27 15:05:55 jmc Exp $ PROG= tput SRCS= clear_cmd.c reset_cmd.c tparm_type.c tput.c transform.c \ @@ -11,6 +11,7 @@ TIC= ${.CURDIR}/../tic CFLAGS+= -I${CURSES} -I${TIC} -I${.CURDIR} -I. .PATH: ${TIC} CLEANFILES+= termsort.h +MAN+= clear.1 termsort.h: ${TIC}/MKtermsort.sh sh ${TIC}/MKtermsort.sh awk ${CURSES}/Caps > ${.TARGET} diff --git a/usr.bin/tput/clear.1 b/usr.bin/tput/clear.1 new file mode 100644 index 000000000..af1fdde25 --- /dev/null +++ b/usr.bin/tput/clear.1 @@ -0,0 +1,163 @@ +.\"*************************************************************************** +.\" Copyright 2018-2021,2022 Thomas E. Dickey * +.\" Copyright 1998-2016,2017 Free Software Foundation, Inc. * +.\" * +.\" Permission is hereby granted, free of charge, to any person obtaining a * +.\" copy of this software and associated documentation files (the * +.\" "Software"), to deal in the Software without restriction, including * +.\" without limitation the rights to use, copy, modify, merge, publish, * +.\" distribute, distribute with modifications, sublicense, and/or sell * +.\" copies of the Software, and to permit persons to whom the Software is * +.\" furnished to do so, subject to the following conditions: * +.\" * +.\" The above copyright notice and this permission notice shall be included * +.\" in all copies or substantial portions of the Software. * +.\" * +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * +.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * +.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * +.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * +.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +.\" * +.\" Except as contained in this notice, the name(s) of the above copyright * +.\" holders shall not be used in advertising or otherwise to promote the * +.\" sale, use or other dealings in this Software without prior written * +.\" authorization. * +.\"*************************************************************************** +.\" +.\" $Id: clear.1,v 1.1 2024/04/27 15:05:55 jmc Exp $ +.TH clear 1 "" +.\" these would be fallbacks for DS/DE, +.\" but groff changed the meaning of the macros. +.de NS +.ie n .sp +.el .sp .5 +.ie n .in +4 +.el .in +2 +.nf +.ft C \" Courier +.. +.de NE +.fi +.ft R +.ie n .in -4 +.el .in -2 +.. +.ie \n(.g .ds `` \(lq +.el .ds `` `` +.ie \n(.g .ds '' \(rq +.el .ds '' '' +.de bP +.ie n .IP \(bu 4 +.el .IP \(bu 2 +.. +.ds n 5 +.SH NAME +\fBclear\fP \- clear the terminal screen +.SH SYNOPSIS +\fBclear\fR [\fB\-T\fItype\fR] [\fB\-V\fR] [\fB\-x\fR] +.br +.SH DESCRIPTION +\fBclear\fP clears your terminal's screen if this is possible, +including the terminal's scrollback buffer +(if the extended \*(``E3\*('' capability is defined). +\fBclear\fP looks in the environment for the terminal type +given by the environment variable \fBTERM\fP, +and then in the +\fBterminfo\fP database to determine how to clear the screen. +.PP +\fBclear\fP writes to the standard output. +You can redirect the standard output to a file (which prevents +\fBclear\fP from actually clearing the screen), +and later \fBcat\fP the file to the screen, clearing it at that point. +.SH OPTIONS +.PP +.TP 5 +.B \-T \fItype\fP +indicates the \fItype\fP of terminal. +Normally this option is +unnecessary, because the default is taken from the environment +variable \fBTERM\fP. +If \fB\-T\fP is specified, then the shell +variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored. +.TP +.B \-V +reports the version of ncurses which was used in this program, and exits. +The options are as follows: +.TP +.B \-x +do not attempt to clear the terminal's scrollback buffer +using the extended \*(``E3\*('' capability. +.SH HISTORY +A \fBclear\fP command appeared in 2.79BSD dated February 24, 1979. +Later that was provided in Unix 8th edition (1985). +.PP +AT&T adapted a different BSD program (\fBtset\fP) to make +a new command (\fBtput\fP), +and used this to replace the \fBclear\fP command with a shell script +which calls \fBtput clear\fP, e.g., +.NS +/usr/bin/tput ${1:+-T$1} clear 2> /dev/null +exit +.NE +.PP +In 1989, when Keith Bostic revised the BSD \fBtput\fP command +to make it similar to the AT&T \fBtput\fP, +he added a shell script for the \fBclear\fP command: +.NS +exec tput clear +.NE +.PP +The remainder of the script in each case is a copyright notice. +.PP +The ncurses \fBclear\fP command began in 1995 by adapting the original +BSD \fBclear\fP command (with terminfo, of course). +.PP +The \fBE3\fP extension came later: +.bP +In June 1999, \fBxterm\fP provided an extension to the standard control +sequence for clearing the screen. +Rather than clearing just the visible part of the screen using +.NS +printf '\\033[2J' +.NE +.IP +one could clear the \fIscrollback\fP using +.NS +printf '\\033[\fB3\fPJ' +.NE +.IP +This is documented in \fIXTerm Control Sequences\fP as a feature originating +with \fBxterm\fP. +.bP +A few other terminal developers adopted the feature, e.g., PuTTY in 2006. +.bP +In April 2011, a Red Hat developer submitted a patch to the Linux +kernel, modifying its console driver to do the same thing. +The Linux change, part of the 3.0 release, did not mention \fBxterm\fP, +although it was cited in the Red Hat bug report (#683733) +which led to the change. +.bP +Again, a few other terminal developers adopted the feature. +But the +next relevant step was a change to the \fBclear\fP program in 2013 +to incorporate this extension. +.bP +In 2013, the \fBE3\fP extension was overlooked in \fBtput\fP with +the \*(``clear\*('' parameter. +That was addressed in 2016 by reorganizing \fBtput\fP to share +its logic with \fBclear\fP and \fBtset\fP. +.SH PORTABILITY +Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7 +(POSIX.1-2008) nor X/Open Curses Issue 7 documents tset or reset. +.PP +The latter documents \fBtput\fP, which could be used to replace this utility +either via a shell script or by an alias (such as a symbolic link) to +run \fBtput\fP as \fBclear\fP. +.SH SEE ALSO +\fBtput\fP(1), \fBterminfo\fP(\*n), \fBxterm\fP(1). +.PP +This describes \fBncurses\fP +version 6.4 (patch 20221231).