diff options
| -rw-r--r-- | lib/libc/gen/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libc/gen/execv.3 (renamed from lib/libc/gen/exec.3) | 14 | ||||
| -rw-r--r-- | lib/libc/gen/sysconf.3 | 6 | ||||
| -rw-r--r-- | lib/libc/sys/ioctl.2 | 8 | ||||
| -rw-r--r-- | lib/libc/sys/mmap.2 | 6 | ||||
| -rw-r--r-- | lib/libc/sys/sysctl.2 | 6 | ||||
| -rw-r--r-- | lib/libkvm/kvm_getprocs.3 | 6 | ||||
| -rw-r--r-- | share/man/man7/script.7 | 11 | ||||
| -rw-r--r-- | usr.bin/lastcomm/lastcomm.1 | 6 |
9 files changed, 30 insertions, 37 deletions
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 6868bd745c0..9c16943ac3c 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.80 2019/01/12 00:16:03 jca Exp $ +# $OpenBSD: Makefile.inc,v 1.81 2019/08/11 15:48:08 deraadt Exp $ # gen sources .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen @@ -37,7 +37,7 @@ SRCS+= alarm.c assert.c auth_subr.c authenticate.c \ MAN+= __tfork_thread.3 alarm.3 auth_subr.3 authenticate.3 basename.3 clock.3 \ clock_getcpuclockid.3 confstr.3 \ ctermid.3 daemon.3 devname.3 directory.3 dirname.3 err.3 \ - exec.3 fabs.3 fnmatch.3 fpclassify.3 fpgetmask.3 frexp.3 ftok.3 fts.3 \ + execv.3 fabs.3 fnmatch.3 fpclassify.3 fpgetmask.3 frexp.3 ftok.3 fts.3 \ ftw.3 getbsize.3 getcap.3 getcwd.3 getdomainname.3 getdiskbyname.3 \ getfsent.3 getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ getmntinfo.3 getnetgrent.3 getpagesize.3 getpass.3 getprogname.3 \ diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/execv.3 index bdef4aeb1b7..efff84e6149 100644 --- a/lib/libc/gen/exec.3 +++ b/lib/libc/gen/execv.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: exec.3,v 1.28 2015/11/10 23:48:18 jmc Exp $ +.\" $OpenBSD: execv.3,v 1.1 2019/08/11 15:48:08 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,8 +27,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 10 2015 $ -.Dt EXECL 3 +.Dd $Mdocdate: August 11 2019 $ +.Dt EXECV 3 .Os .Sh NAME .Nm execl , @@ -54,9 +54,7 @@ .Ft int .Fn execvpe "const char *file" "char *const argv[]" "char *const envp[]" .Sh DESCRIPTION -The -.Nm exec -family of functions replace the current process image with a +This family of functions replace the current process image with a new process image. The functions described in this manual page are front-ends for the .Xr execve 2 @@ -162,9 +160,7 @@ these functions will execute the shell with the path of the file as its first argument. (If this attempt fails, no further searching is done.) .Sh RETURN VALUES -If any of the -.Nm exec -functions return, an error has occurred. +If any of these functions return, an error has occurred. The return value is \-1, and the global variable .Va errno will be set to indicate the error. diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3 index 35de14e4ed3..b5d06e78bea 100644 --- a/lib/libc/gen/sysconf.3 +++ b/lib/libc/gen/sysconf.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysconf.3,v 1.34 2018/01/12 04:36:44 deraadt Exp $ +.\" $OpenBSD: sysconf.3,v 1.35 2019/08/11 15:48:08 deraadt Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 12 2018 $ +.Dd $Mdocdate: August 11 2019 $ .Dt SYSCONF 3 .Os .Sh NAME @@ -52,7 +52,7 @@ The available values are as follows: .Bl -tag -width "123456" .It Li _SC_ARG_MAX The maximum bytes of arguments to -.Xr exec 3 +.Xr execve 2 (including the environment). .It Li _SC_CHILD_MAX The maximum number of simultaneous processes per user ID. diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2 index 57a21a803d3..467caf5841a 100644 --- a/lib/libc/sys/ioctl.2 +++ b/lib/libc/sys/ioctl.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ioctl.2,v 1.18 2014/06/27 21:06:33 matthew Exp $ +.\" $OpenBSD: ioctl.2,v 1.19 2019/08/11 15:48:08 deraadt Exp $ .\" $NetBSD: ioctl.2,v 1.5 1995/02/27 12:33:47 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)ioctl.2 8.2 (Berkeley) 12/11/93 .\" -.Dd $Mdocdate: June 27 2014 $ +.Dd $Mdocdate: August 11 2019 $ .Dt IOCTL 2 .Os .Sh NAME @@ -86,12 +86,12 @@ These include: .It Dv FIOCLEX Set close-on-exec flag. The file will be closed when -.Xr exec 3 +.Xr execve 2 is invoked. .It Dv FIONCLEX Clear close-on-exec flag. The file will remain open across -.Xr exec 3 . +.Xr execve 2 . .El .Pp Some generic ioctls are not implemented for all types of file diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2 index 5f3aeea3966..570c6d31ac0 100644 --- a/lib/libc/sys/mmap.2 +++ b/lib/libc/sys/mmap.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mmap.2,v 1.61 2019/03/17 00:59:11 cheloha Exp $ +.\" $OpenBSD: mmap.2,v 1.62 2019/08/11 15:48:08 deraadt Exp $ .\" $NetBSD: mmap.2,v 1.5 1995/06/24 10:48:59 cgd Exp $ .\" .\" Copyright (c) 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)mmap.2 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: March 17 2019 $ +.Dd $Mdocdate: August 11 2019 $ .Dt MMAP 2 .Os .Sh NAME @@ -194,7 +194,7 @@ On this flag is ignored. .It Dv MAP_INHERIT Permit regions to be inherited across -.Xr exec 3 +.Xr execve 2 system calls. On .Ox diff --git a/lib/libc/sys/sysctl.2 b/lib/libc/sys/sysctl.2 index 91dab585947..29cd3ac306c 100644 --- a/lib/libc/sys/sysctl.2 +++ b/lib/libc/sys/sysctl.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.2,v 1.27 2019/05/09 15:05:47 claudio Exp $ +.\" $OpenBSD: sysctl.2,v 1.28 2019/08/11 15:48:08 deraadt Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 9 2019 $ +.Dd $Mdocdate: August 11 2019 $ .Dt SYSCTL 2 .Os .Sh NAME @@ -505,7 +505,7 @@ greater than 0, this variable may not be changed. .It Dv KERN_ARGMAX Pq Va kern.argmax The maximum number of bytes allowed among the arguments to -.Xr exec 3 . +.Xr execve 2 . .It Dv KERN_AUDIO Pq Va kern.audio Control device-independent aspects of the .Xr audio 4 diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3 index 494168bcabb..fdefbbc698d 100644 --- a/lib/libkvm/kvm_getprocs.3 +++ b/lib/libkvm/kvm_getprocs.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kvm_getprocs.3,v 1.20 2014/01/21 03:15:45 schwarze Exp $ +.\" $OpenBSD: kvm_getprocs.3,v 1.21 2019/08/11 15:48:08 deraadt Exp $ .\" $NetBSD: kvm_getprocs.3,v 1.13 2003/08/07 16:44:37 agc Exp $ .\" .\" Copyright (c) 1992, 1993 @@ -34,7 +34,7 @@ .\" .\" @(#)kvm_getprocs.3 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: January 21 2014 $ +.Dd $Mdocdate: August 11 2019 $ .Dt KVM_GETPROCS 3 .Os .Sh NAME @@ -123,7 +123,7 @@ returns a null-terminated argument vector that corresponds to the command line arguments passed to process indicated by .Fa p . Most likely, these arguments correspond to the values passed to -.Xr exec 3 +.Xr execve 2 on process creation. This information is, however, deliberately under control of the process itself. diff --git a/share/man/man7/script.7 b/share/man/man7/script.7 index 335c84f58e3..80542d1f46f 100644 --- a/share/man/man7/script.7 +++ b/share/man/man7/script.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: script.7,v 1.7 2014/01/21 03:15:46 schwarze Exp $ +.\" $OpenBSD: script.7,v 1.8 2019/08/11 15:48:08 deraadt Exp $ .\" .\" $NetBSD: script.7,v 1.1 2005/05/07 02:20:34 perry Exp $ .\" @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: January 21 2014 $ +.Dd $Mdocdate: August 11 2019 $ .Dt SCRIPT 7 .Os .Sh NAME @@ -176,11 +176,8 @@ Most shells (such as and certain other facilities (including .Xr execlp 3 and -.Xr execvp 3 -but not other types of -.Xr exec 3 -calls) still pass -interpreter scripts that do not include the +.Xr execvp 3 ) +still pass interpreter scripts that do not include the .Sq #! (and thus fail to execute with .Er ENOEXEC ) diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1 index 0764f66c449..02d4df415e1 100644 --- a/usr.bin/lastcomm/lastcomm.1 +++ b/usr.bin/lastcomm/lastcomm.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: lastcomm.1,v 1.22 2019/07/26 12:08:18 millert Exp $ +.\" $OpenBSD: lastcomm.1,v 1.23 2019/08/11 15:48:08 deraadt Exp $ .\" $NetBSD: lastcomm.1,v 1.5 1995/10/22 01:43:41 ghudson Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)lastcomm.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: July 26 2019 $ +.Dd $Mdocdate: August 11 2019 $ .Dt LASTCOMM 1 .Os .Sh NAME @@ -111,7 +111,7 @@ file. .It Li F The command ran after a fork, but without a following -.Xr exec 3 . +.Xr execve 2 . .It Li P The command was terminated due to a .Xr pledge 2 |