[Midnightbsd-cvs] src: libc/sys: Merge changes.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Oct 30 17:20:24 EDT 2008
Log Message:
-----------
Merge changes.
Modified Files:
--------------
src/lib/libc/sys:
Makefile.inc (r1.3 -> r1.4)
kldnext.2 (r1.2 -> r1.3)
recv.2 (r1.2 -> r1.3)
Added Files:
-----------
src/lib/libc/sys:
stack_protector.c (r1.5)
Removed Files:
-------------
src/lib/libc/sys:
ntp_gettime.2
-------------- next part --------------
Index: recv.2
===================================================================
RCS file: /home/cvs/src/lib/libc/sys/recv.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/sys/recv.2 -L lib/libc/sys/recv.2 -u -r1.2 -r1.3
--- lib/libc/sys/recv.2
+++ lib/libc/sys/recv.2
@@ -9,10 +9,6 @@
.\" 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. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. 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.
@@ -30,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)recv.2 8.3 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.26.2.2 2006/03/09 09:18:52 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.34 2007/01/09 00:28:15 imp Exp $
.\"
-.Dd February 21, 1994
+.Dd December 28, 2006
.Dt RECV 2
.Os
.Sh NAME
@@ -98,12 +94,12 @@
.Pp
If no messages are available at the socket, the
receive call waits for a message to arrive, unless
-the socket is nonblocking (see
+the socket is non-blocking (see
.Xr fcntl 2 )
in which case the value
--1 is returned and the external variable
+\-1 is returned and the global variable
.Va errno
-set to
+is set to
.Er EAGAIN .
The receive calls normally return any data available,
up to the requested amount,
@@ -117,7 +113,7 @@
.Pp
The
.Xr select 2
-system call may be used to determine when more data arrive.
+system call may be used to determine when more data arrives.
.Pp
The
.Fa flags
@@ -173,13 +169,13 @@
.Pp
.Bd -literal
struct msghdr {
- caddr_t msg_name; /* optional address */
- u_int msg_namelen; /* size of address */
- struct iovec *msg_iov; /* scatter/gather array */
- u_int msg_iovlen; /* # elements in msg_iov */
- caddr_t msg_control; /* ancillary data, see below */
- u_int msg_controllen; /* ancillary data buffer len */
- int msg_flags; /* flags on received message */
+ void *msg_name; /* optional address */
+ socklen_t msg_namelen; /* size of address */
+ struct iovec *msg_iov; /* scatter/gather array */
+ int msg_iovlen; /* # elements in msg_iov */
+ void *msg_control; /* ancillary data, see below */
+ socklen_t msg_controllen;/* ancillary data buffer len */
+ int msg_flags; /* flags on received message */
};
.Ed
.Pp
@@ -207,11 +203,11 @@
The messages are of the form:
.Bd -literal
struct cmsghdr {
- u_int cmsg_len; /* data byte count, including hdr */
- int cmsg_level; /* originating protocol */
- int cmsg_type; /* protocol-specific type */
+ socklen_t cmsg_len; /* data byte count, including hdr */
+ int cmsg_level; /* originating protocol */
+ int cmsg_type; /* protocol-specific type */
/* followed by
- u_char cmsg_data[]; */
+ u_char cmsg_data[]; */
};
.Ed
.Pp
--- lib/libc/sys/ntp_gettime.2
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"
-.\" Copyright (c) 2003 Tom Rhodes
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
-.\"
-.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.4 2004/07/02 19:07:30 ru Exp $
-.\"
-.Dd June 21, 2003
-.Dt NTP_GETTIME 2
-.Os
-.Sh NAME
-.Nm ntp_gettime
-.Nd NTP user application interface
-.Sh SYNOPSIS
-.In sys/timex.h
-.Ft int
-.Fn ntp_gettime "struct ntptimeval *ntv"
-.Sh DESCRIPTION
-The time returned by
-.Fn ntp_gettime
-is in a
-.Vt timespec
-structure, but may be in either microsecond
-(seconds and microseconds) or nanosecond (seconds and nanoseconds) format.
-The particular format in use is determined by the
-.Dv STA_NANO
-bit of the status
-word returned by the
-.Fn ntp_adjtime
-system call.
-.Fn ntp_gettime
-has as argument a pointer to the
-.Vt ntptimeval
-structure with the following members:
-.Bd -literal
-struct ntptimeval {
- struct timespec time; /* current time (ns) (ro) */
- long maxerror; /* maximum error (us) (ro) */
- long esterror; /* estimated error (us) (ro) */
- long tai; /* TAI-UTC offset */
- int time_state; /* time status */
-};
-.Ed
-.Pp
-These are understood as:
-.Bl -tag -width ".Va time_state"
-.It Va time
-Current time (read-only).
-.It Va maxerror
-Maximum error in microseconds (read-only).
-.It Va esterror
-Estimated error in microseconds (read-only).
-.It Va tai
-Offset in seconds between the TAI and UTC time scales.
-This offset is published twice a year and is an integral number of
-seconds between TAI (which does not have leap seconds) and UTC (which
-does).
-.Xr ntpd 8
-or some other agent maintains this value.
-A value of 0 means unknown.
-As of the date of the manual page, the offset is 32 seconds.
-.It Va time_state
-Current time status.
-.El
-.Sh RETURN VALUES
-.Rv -std ntp_gettime
-.Pp
-Possible states of the clock are:
-.Pp
-.Bl -tag -compact -width ".Dv TIME_ERROR"
-.It Dv TIME_OK
-Everything okay, no leap second warning.
-.It Dv TIME_INS
-Positive leap second warning.
-At the end of the day, an additional second will be inserted after 23:59:59.
-.It Dv TIME_DEL
-Negative leap second warning.
-At the end of the day, 23:59:59 is skipped.
-.It Dv TIME_OOP
-Leap second in progress.
-.It Dv TIME_WAIT
-Leap second has occurred.
-.It Dv TIME_ERROR
-Clock not synchronized.
-.El
-.Sh SEE ALSO
-.Xr ntp_adjtime 2 ,
-.Xr ntpd 8
-.Bl -tag -width indent
-.It Pa http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html
-.It Pa http://www.boulder.nist.gov/timefreq/general/faq.htm
-.It Pa ftp://time.nist.gov/pub/leap-seconds.list
-.El
-.Sh AUTHORS
-This manual page was written by
-.An Tom Rhodes Aq trhodes at FreeBSD.org .
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/lib/libc/sys/Makefile.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/libc/sys/Makefile.inc -L lib/libc/sys/Makefile.inc -u -r1.3 -r1.4
--- lib/libc/sys/Makefile.inc
+++ lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113 2005/07/07 18:17:55 jhb Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.127 2007/09/15 14:33:55 imp Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -18,7 +18,10 @@
.endif
# Sources common to both syscall interfaces:
-SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c __error.c
+SRCS+= stack_protector.c __error.c
+.if !defined(WITHOUT_SYSCALL_COMPAT)
+SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c
+.endif
# Add machine dependent asm sources:
SRCS+=${MDASM}
@@ -43,6 +46,8 @@
SRCS+= ${SASM} ${SPSEUDO}
+SYM_MAPS+= ${.CURDIR}/sys/Symbol.map
+
# Generated files
CLEANFILES+= ${SASM} ${SPSEUDO}
@@ -53,7 +58,7 @@
printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \
> ${.TARGET}
-MAN+= _exit.2 accept.2 access.2 acct.2 adjtime.2 \
+MAN+= _exit.2 abort2.2 accept.2 access.2 acct.2 adjtime.2 \
aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \
aio_suspend.2 aio_waitcomplete.2 aio_write.2 \
bind.2 brk.2 chdir.2 chflags.2 \
@@ -70,17 +75,21 @@
kldunload.2 kqueue.2 kse.2 ktrace.2 link.2 lio_listio.2 listen.2 \
lseek.2 \
madvise.2 mincore.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 \
- mlockall.2 mmap.2 modfind.2 modnext.2 modstat.2 mount.2 \
- mprotect.2 msync.2 munmap.2 nanosleep.2 ntp_adjtime.2 ntp_gettime.2 \
+ mlockall.2 mmap.2 modfind.2 modnext.2 modstat.2 mount.2 mprotect.2 \
+ mq_close.2 mq_getattr.2 mq_notify.2 mq_open.2 mq_receive.2 mq_send.2 \
+ mq_setattr.2 \
+ msync.2 munmap.2 nanosleep.2 ntp_adjtime.2 \
nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 ptrace.2 quotactl.2 \
read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \
setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \
setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \
- sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigreturn.2 \
- sigstack.2 sigsuspend.2 sigwait.2 \
+ sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \
+ sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \
socket.2 socketpair.2 stat.2 statfs.2 \
+ sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \
swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \
+ timer_create.2 timer_delete.2 timer_settime.2 \
truncate.2 umask.2 undelete.2 \
unlink.2 utimes.2 utrace.2 uuidgen.2 vfork.2 wait.2 write.2
.if !defined(NO_P1003_1B)
@@ -96,12 +105,18 @@
MLINKS+=chown.2 fchown.2 chown.2 lchown.2
MLINKS+=clock_gettime.2 clock_getres.2 clock_gettime.2 clock_settime.2
MLINKS+=dup.2 dup2.2
-MLINKS+=extattr_get_file.2 extattr_set_file.2 \
+MLINKS+=extattr_get_file.2 extattr.2 \
+ extattr_get_file.2 extattr_delete_fd.2 \
extattr_get_file.2 extattr_delete_file.2 \
+ extattr_get_file.2 extattr_delete_list.2 \
extattr_get_file.2 extattr_get_fd.2 \
+ extattr_get_file.2 extattr_get_list.2 \
+ extattr_get_file.2 extattr_list_fd.2 \
+ extattr_get_file.2 extattr_list_file.2 \
+ extattr_get_file.2 extattr_list_link.2 \
extattr_get_file.2 extattr_set_fd.2 \
- extattr_get_file.2 extattr_delete_fd.2 \
- extattr_get_file.2 extattr.2
+ extattr_get_file.2 extattr_set_file.2 \
+ extattr_get_file.2 extattr_set_link.2
MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
MLINKS+=getdirentries.2 getdents.2
MLINKS+=getfh.2 lgetfh.2
@@ -126,18 +141,25 @@
MLINKS+=mlockall.2 munlockall.2
MLINKS+=modnext.2 modfnext.2
MLINKS+=mount.2 nmount.2 mount.2 unmount.2
+MLINKS+=mq_send.2 mq_timedsend.2
+MLINKS+=mq_receive.2 mq_timedreceive.2
+MLINKS+=ntp_adjtime.2 ntp_gettime.2
MLINKS+=pathconf.2 fpathconf.2
MLINKS+=read.2 pread.2 read.2 readv.2 read.2 preadv.2
MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2
+MLINKS+=select.2 FD_CLR.3 select.2 FD_ISSET.3 select.2 FD_SET.3 \
+ select.2 FD_ZERO.3
MLINKS+=send.2 sendmsg.2 send.2 sendto.2
MLINKS+=setpgid.2 setpgrp.2
MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2
MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
MLINKS+=shmat.2 shmdt.2
+MLINKS+=sigwaitinfo.2 sigtimedwait.2
MLINKS+=stat.2 fstat.2 stat.2 lstat.2
MLINKS+=statfs.2 fstatfs.2
MLINKS+=syscall.2 __syscall.2
MLINKS+=swapon.2 swapoff.2
+MLINKS+=timer_settime.2 timer_gettime.2 timer_settime.2 timer_getoverrun.2
MLINKS+=truncate.2 ftruncate.2
MLINKS+=utimes.2 futimes.2 utimes.2 lutimes.2
MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
Index: kldnext.2
===================================================================
RCS file: /home/cvs/src/lib/libc/sys/kldnext.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libc/sys/kldnext.2 -L lib/libc/sys/kldnext.2 -u -r1.2 -r1.3
--- lib/libc/sys/kldnext.2
+++ lib/libc/sys/kldnext.2
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/kldnext.2,v 1.16 2005/02/13 22:25:12 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kldnext.2,v 1.18 2006/09/17 21:27:34 ru Exp $
.\"
-.Dd December 31, 2006
+.Dd February 22, 2006
.Dt KLDNEXT 2
.Os
.Sh NAME
@@ -43,12 +43,12 @@
.Fn kldnext
system call
returns the fileid of the next kld file (that is, the one after
-.Va fileid )
+.Fa fileid )
or 0 if
-.Va fileid
+.Fa fileid
is the last file loaded.
To get the fileid of the first kld file, pass
-.Va fileid
+.Fa fileid
of 0 to
.Fn kldnext .
.Sh RETURN VALUES
@@ -67,7 +67,7 @@
is
.Er ENOENT ,
which is set when
-.Va fileid
+.Fa fileid
refers to a kld file that does not exist (is not loaded).
.Sh SEE ALSO
.Xr kldfind 2 ,
More information about the Midnightbsd-cvs
mailing list