diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-09-02 21:18:42 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-09-02 21:18:42 +0000 |
commit | 4d92fcb5fc5df9719fcbdcfe0cc532b29008e9d5 (patch) | |
tree | a4cad803c03ee0c200bfa6a98fcd6bc9264ee991 /lib/libc/gen | |
parent | 948605961feb3cc5dde9787c888307a37ac52af6 (diff) |
More correction of section 3 layout. directory->opendir, fts->fts_open,
getcap->cgetent. pwcache->user_from_uid. And then repair references.
ok jmc
Diffstat (limited to 'lib/libc/gen')
-rw-r--r-- | lib/libc/gen/Makefile.inc | 10 | ||||
-rw-r--r-- | lib/libc/gen/cgetent.3 (renamed from lib/libc/gen/getcap.3) | 4 | ||||
-rw-r--r-- | lib/libc/gen/fts_open.3 (renamed from lib/libc/gen/fts.3) | 59 | ||||
-rw-r--r-- | lib/libc/gen/ftw.3 | 8 | ||||
-rw-r--r-- | lib/libc/gen/opendir.3 (renamed from lib/libc/gen/directory.3) | 4 | ||||
-rw-r--r-- | lib/libc/gen/scandir.3 | 6 | ||||
-rw-r--r-- | lib/libc/gen/user_from_uid.3 (renamed from lib/libc/gen/pwcache.3) | 4 |
7 files changed, 36 insertions, 59 deletions
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 9c16943ac3c..cf36ead40e9 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.81 2019/08/11 15:48:08 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.82 2019/09/02 21:18:40 deraadt Exp $ # gen sources .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen @@ -36,9 +36,9 @@ 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 \ - 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 \ + ctermid.3 daemon.3 devname.3 opendir.3 dirname.3 err.3 \ + execv.3 fabs.3 fnmatch.3 fpclassify.3 fpgetmask.3 frexp.3 ftok.3 fts_open.3 \ + ftw.3 getbsize.3 cgetent.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 \ getpwent.3 getpwnam.3 \ @@ -49,7 +49,7 @@ MAN+= __tfork_thread.3 alarm.3 auth_subr.3 authenticate.3 basename.3 clock.3 \ popen.3 posix_spawn.3 posix_spawn_file_actions_addopen.3 \ posix_spawn_file_actions_init.3 posix_spawnattr_getflags.3 \ posix_spawnattr_getpgroup.3 posix_spawnattr_init.3 \ - psignal.3 pw_dup.3 pwcache.3 raise.3 readpassphrase.3 \ + psignal.3 pw_dup.3 user_from_uid.3 raise.3 readpassphrase.3 \ scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ siginterrupt.3 signal.3 \ sigaddset.3 sigwait.3 sleep.3 statvfs.3 sysconf.3 strtofflags.3 \ diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/cgetent.3 index d1db1e887e4..212241e1333 100644 --- a/lib/libc/gen/getcap.3 +++ b/lib/libc/gen/cgetent.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getcap.3,v 1.38 2015/11/10 23:48:18 jmc Exp $ +.\" $OpenBSD: cgetent.3,v 1.1 2019/09/02 21:18:41 deraadt Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 10 2015 $ +.Dd $Mdocdate: September 2 2019 $ .Dt CGETENT 3 .Os .Sh NAME diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts_open.3 index 2c7d8061455..4b03a613eef 100644 --- a/lib/libc/gen/fts.3 +++ b/lib/libc/gen/fts_open.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fts.3,v 1.36 2016/06/28 17:25:08 millert Exp $ +.\" $OpenBSD: fts_open.3,v 1.1 2019/09/02 21:18:41 deraadt Exp $ .\" .\" Copyright (c) 1989, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 .\" -.Dd $Mdocdate: June 28 2016 $ +.Dd $Mdocdate: September 2 2019 $ .Dt FTS_OPEN 3 .Os .Sh NAME @@ -54,8 +54,7 @@ .Ft int .Fn fts_close "FTS *ftsp" .Sh DESCRIPTION -The -.Nm fts +These functions are provided for traversing .Ux file hierarchies. @@ -64,9 +63,7 @@ The function returns a .Dq handle on a file hierarchy, which is then supplied to -the other -.Nm fts -functions. +the other functions. The function .Fn fts_read returns a pointer to a structure describing one of the files in the file @@ -249,9 +246,7 @@ Note that while .Fa fts_level cannot hold a number of levels greater than .Dv FTS_MAXLEVEL , -the -.Nm fts -functions themselves are not limited to a fixed number +the functions themselves are not limited to a fixed number of levels. Application code that inspects .Fa fts_level @@ -280,15 +275,11 @@ Otherwise, the contents of the field are undefined. .It Fa fts_number This field is provided for the use of the application program and is -not modified by the -.Nm fts -functions. +not modified by the functions. It is initialized to 0. .It Fa fts_pointer This field is provided for the use of the application program and is -not modified by the -.Nm fts -functions. +not modified by the functions. It is initialized to .Dv NULL . .It Fa fts_parent @@ -384,9 +375,7 @@ followed immediately whether or not .Dv FTS_LOGICAL is also specified. .It Dv FTS_LOGICAL -This option causes the -.Nm fts -routines to return +This option causes the routines to return .Li FTSENT structures for the targets of symbolic links instead of the symbolic links themselves. @@ -403,16 +392,14 @@ be provided to the .Fn fts_open function. .It Dv FTS_NOCHDIR -As a performance optimization, the -.Nm fts -functions change directories as they walk the file hierarchy. +As a performance optimization, the functions change directories as they walk +the file hierarchy. This has the side-effect that an application cannot rely on being in any particular directory during the traversal. The .Dv FTS_NOCHDIR -option turns off this optimization, and the -.Nm fts -functions will not change the current directory. +option turns off this optimization, and the functions will not change +the current directory. Note that applications should not themselves change their current directory and try to access files unless .Dv FTS_NOCHDIR @@ -426,9 +413,7 @@ structures reference file characteristic information (the .Fa statp field) for each file visited. This option relaxes that requirement as a performance optimization, -allowing the -.Nm fts -functions to set the +allowing the functions to set the .Fa fts_info field to .Dv FTS_NSOK @@ -436,9 +421,7 @@ and leave the contents of the .Fa statp field undefined. .It Dv FTS_PHYSICAL -This option causes the -.Nm fts -routines to return +This option causes the routines to return .Li FTSENT structures for symbolic links themselves instead of the target files they point to. @@ -462,16 +445,12 @@ any files named or .Dq .. encountered in the file hierarchy are ignored. -This option causes the -.Nm fts -routines to return +This option causes the routines to return .Li FTSENT structures for them. .It Dv FTS_XDEV -This option prevents -.Nm fts -from descending into directories that have a different device number -than the file from which the descent began. +This option prevents from descending into directories that have +a different device number than the file from which the descent began. .El .Pp The @@ -772,9 +751,7 @@ is empty. .Xr stat 2 , .Xr qsort 3 .Sh HISTORY -The -.Nm fts -functions first appeared in +These functions first appeared in .Bx 4.3 Reno . The interface was revised in .Bx 4.4 . diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3 index 3548b035ebd..6c344a31827 100644 --- a/lib/libc/gen/ftw.3 +++ b/lib/libc/gen/ftw.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftw.3,v 1.13 2019/01/25 00:19:25 millert Exp $ +.\" $OpenBSD: ftw.3,v 1.14 2019/09/02 21:18:41 deraadt Exp $ .\" .\" Copyright (c) 2003 Todd C. Miller <millert@openbsd.org> .\" @@ -18,7 +18,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.Dd $Mdocdate: January 25 2019 $ +.Dd $Mdocdate: September 2 2019 $ .Dt FTW 3 .Os .Sh NAME @@ -44,7 +44,7 @@ .Bf -symbolic These functions are provided for compatibility with legacy code. New code should use the -.Xr fts 3 +.Xr fts_open 3 functions. .Ef .Pp @@ -195,7 +195,7 @@ only, greater than .Xr close 2 , .Xr open 2 , .Xr stat 2 , -.Xr fts 3 , +.Xr fts_open 3 , .Xr malloc 3 , .Xr opendir 3 , .Xr readdir 3 diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/opendir.3 index f892c4a9b88..1b5ac656782 100644 --- a/lib/libc/gen/directory.3 +++ b/lib/libc/gen/opendir.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: directory.3,v 1.25 2017/09/18 15:57:02 millert Exp $ +.\" $OpenBSD: opendir.3,v 1.1 2019/09/02 21:18:41 deraadt Exp $ .\" .\" Copyright (c) 1983, 1991, 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: September 18 2017 $ +.Dd $Mdocdate: September 2 2019 $ .Dt OPENDIR 3 .Os .Sh NAME diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index ae26b417ddb..13f58e2b9b7 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: scandir.3,v 1.14 2015/02/28 21:51:57 bentley Exp $ +.\" $OpenBSD: scandir.3,v 1.15 2019/09/02 21:18:41 deraadt Exp $ .\" .\" Copyright (c) 1983, 1991, 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: February 28 2015 $ +.Dd $Mdocdate: September 2 2019 $ .Dt SCANDIR 3 .Os .Sh NAME @@ -96,8 +96,8 @@ Returns \-1 if the directory cannot be opened for reading or if .Xr malloc 3 cannot allocate enough memory to hold all the data structures. .Sh SEE ALSO -.Xr directory 3 , .Xr malloc 3 , +.Xr opendir 3 , .Xr qsort 3 , .Xr dir 5 .Sh STANDARDS diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/user_from_uid.3 index 1f37c035560..88c6a09d0f5 100644 --- a/lib/libc/gen/pwcache.3 +++ b/lib/libc/gen/user_from_uid.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pwcache.3,v 1.15 2018/09/13 16:50:54 jmc Exp $ +.\" $OpenBSD: user_from_uid.3,v 1.1 2019/09/02 21:18:41 deraadt Exp $ .\" .\" Copyright (c) 1989, 1991, 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: September 13 2018 $ +.Dd $Mdocdate: September 2 2019 $ .Dt USER_FROM_UID 3 .Os .Sh NAME |