diff options
author | Mark Newton <newton@FreeBSD.org> | 1999-07-30 12:45:21 +0000 |
---|---|---|
committer | Mark Newton <newton@FreeBSD.org> | 1999-07-30 12:45:21 +0000 |
commit | 587297dc40223d0c68fffd63fa8eafc3d1080352 (patch) | |
tree | 45338a5063a0fbf50142987de64d433d7a39070e /sys/compat/svr4 | |
parent | 6a8edfca23c8c12f18578740cadbdade1a38a603 (diff) | |
download | src-587297dc40223d0c68fffd63fa8eafc3d1080352.tar.gz src-587297dc40223d0c68fffd63fa8eafc3d1080352.zip |
Add $Id$ tags
Notes
Notes:
svn path=/head/; revision=49267
Diffstat (limited to 'sys/compat/svr4')
48 files changed, 140 insertions, 23 deletions
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c index f8500de3a4e2..5fcfcb5bafca 100644 --- a/sys/compat/svr4/imgact_svr4.c +++ b/sys/compat/svr4/imgact_svr4.c @@ -29,6 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h index 45e08b3d6947..a42d49d4f9d4 100644 --- a/sys/compat/svr4/svr4.h +++ b/sys/compat/svr4/svr4.h @@ -23,6 +23,8 @@ * 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. + * + * $Id$ */ #if !defined(_SVR4_H) diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h index 2d4f10f047dc..f1a405f2fd6a 100644 --- a/sys/compat/svr4/svr4_acl.h +++ b/sys/compat/svr4/svr4_acl.h @@ -27,6 +27,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_ACL_H_ #define _SVR4_ACL_H_ diff --git a/sys/compat/svr4/svr4_dirent.h b/sys/compat/svr4/svr4_dirent.h index a2e8a59c9769..26ee8164aeb0 100644 --- a/sys/compat/svr4/svr4_dirent.h +++ b/sys/compat/svr4/svr4_dirent.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_DIRENT_H_ diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h index 42de6d0abc67..50dd46a43127 100644 --- a/sys/compat/svr4/svr4_errno.h +++ b/sys/compat/svr4/svr4_errno.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_ERRNO_H_ diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h index 84fcd3d5f035..301915940bd3 100644 --- a/sys/compat/svr4/svr4_exec.h +++ b/sys/compat/svr4/svr4_exec.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_EXEC_H_ diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index b6e9b9a8cc00..f4dd3370a159 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -27,6 +27,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h index 8c202f2d63c2..6ee21fae8339 100644 --- a/sys/compat/svr4/svr4_fcntl.h +++ b/sys/compat/svr4/svr4_fcntl.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_FCNTL_H_ diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index c82b09bace1e..bc7f9701f99f 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4_filio.h b/sys/compat/svr4/svr4_filio.h index 2f105a780bdf..254e2da813c7 100644 --- a/sys/compat/svr4/svr4_filio.h +++ b/sys/compat/svr4/svr4_filio.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_FILIO_H_ diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h index 669d5274ee98..bc726c12cefa 100644 --- a/sys/compat/svr4/svr4_fuser.h +++ b/sys/compat/svr4/svr4_fuser.h @@ -1,4 +1,5 @@ /* + * $Id$ * Derived from: * $NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $ */ diff --git a/sys/compat/svr4/svr4_hrt.h b/sys/compat/svr4/svr4_hrt.h index ce54ad0c9aa8..8fc0231f4645 100644 --- a/sys/compat/svr4/svr4_hrt.h +++ b/sys/compat/svr4/svr4_hrt.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_HRT_H_ diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index 2ce3004dc2ab..02c120217636 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h index e95fa5a1ae57..f95e5ee53453 100644 --- a/sys/compat/svr4/svr4_ioctl.h +++ b/sys/compat/svr4/svr4_ioctl.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_IOCTL_H_ diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c index 8bb661b66d9c..1f9b7573cc72 100644 --- a/sys/compat/svr4/svr4_ipc.c +++ b/sys/compat/svr4/svr4_ipc.c @@ -1,4 +1,5 @@ /* + * $Id$ * Derived from: * $NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $ */ diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h index 798920d8a286..56d7f5572be7 100644 --- a/sys/compat/svr4/svr4_ipc.h +++ b/sys/compat/svr4/svr4_ipc.h @@ -26,6 +26,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_IPC_H_ diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 262fd064c0e1..740dd1faf743 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ /* @@ -297,7 +299,7 @@ again: goto out; inp = buf; - outp = SCARG(uap, dp); + outp = (caddr_t)SCARG(uap, dp); resid = SCARG(uap, nbytes); if ((len = buflen - auio.uio_resid) == 0) goto eof; @@ -357,7 +359,7 @@ again: DPRINTF(("block finished\n")); /* if we squished out the whole block, try again */ fp->f_offset = off; /* update the vnode offset */ - if (outp == SCARG(uap, dp)) + if (outp == (caddr_t)SCARG(uap, dp)) goto again; eof: @@ -616,7 +618,7 @@ svr4_sys_mknod(p, uap) int *retval = p->p_retval; return svr4_mknod(p, retval, SCARG(uap, path), SCARG(uap, mode), - svr4_to_bsd_odev_t(SCARG(uap, dev))); + (svr4_dev_t)svr4_to_bsd_odev_t(SCARG(uap, dev))); } @@ -628,7 +630,7 @@ svr4_sys_xmknod(p, uap) int *retval = p->p_retval; return svr4_mknod(p, retval, SCARG(uap, path), SCARG(uap, mode), - svr4_to_bsd_dev_t(SCARG(uap, dev))); + (svr4_dev_t)svr4_to_bsd_dev_t(SCARG(uap, dev))); } diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h index 9a7f213ba06b..77500fad8a3d 100644 --- a/sys/compat/svr4/svr4_mman.h +++ b/sys/compat/svr4/svr4_mman.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_MMAN_H_ diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h index 101d36e19ed7..6a234e72a1f1 100644 --- a/sys/compat/svr4/svr4_proto.h +++ b/sys/compat/svr4/svr4_proto.h @@ -372,10 +372,10 @@ struct svr4_sys_send_args { }; struct svr4_sys_sendto_args { int s; char s_[PAD_(int)]; - const void * buf; char buf_[PAD_(const void *)]; + void * buf; char buf_[PAD_(void *)]; size_t len; char len_[PAD_(size_t)]; int flags; char flags_[PAD_(int)]; - const struct sockaddr * to; char to_[PAD_(const struct sockaddr *)]; + struct sockaddr * to; char to_[PAD_(struct sockaddr *)]; int tolen; char tolen_[PAD_(int)]; }; int svr4_sys_open __P((struct proc *, struct svr4_sys_open_args *)); diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c index 083049f20ae5..32717998d72e 100644 --- a/sys/compat/svr4/svr4_resource.c +++ b/sys/compat/svr4/svr4_resource.c @@ -38,6 +38,8 @@ * 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. + * + * $Id$ */ /* diff --git a/sys/compat/svr4/svr4_resource.h b/sys/compat/svr4/svr4_resource.h index 98c4fcef9338..caab421cd6c6 100644 --- a/sys/compat/svr4/svr4_resource.h +++ b/sys/compat/svr4/svr4_resource.h @@ -37,6 +37,8 @@ * 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. + * + * $Id$ */ /* diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h index fe63e5d94dc5..0f4c3e28f7cc 100644 --- a/sys/compat/svr4/svr4_siginfo.h +++ b/sys/compat/svr4/svr4_siginfo.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SIGINFO_H_ diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c index 5b7d09355797..2e1e088f902f 100644 --- a/sys/compat/svr4/svr4_signal.c +++ b/sys/compat/svr4/svr4_signal.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h index 0bc3e2d34723..0b02985068d4 100644 --- a/sys/compat/svr4/svr4_signal.h +++ b/sys/compat/svr4/svr4_signal.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SIGNAL_H_ diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c index 314e1cd8d001..45498b38303e 100644 --- a/sys/compat/svr4/svr4_socket.c +++ b/sys/compat/svr4/svr4_socket.c @@ -27,6 +27,8 @@ * 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. + * + * $Id$ */ /* @@ -66,7 +68,7 @@ struct svr4_sockcache_entry { struct proc *p; /* Process for the socket */ void *cookie; /* Internal cookie used for matching */ struct sockaddr_un sock;/* Pathname for the socket */ - dev_t dev; /* Device where the socket lives on */ + udev_t dev; /* Device where the socket lives on */ ino_t ino; /* Inode where the socket lives on */ TAILQ_ENTRY(svr4_sockcache_entry) entries; }; @@ -78,7 +80,7 @@ struct sockaddr_un * svr4_find_socket(p, fp, dev, ino) struct proc *p; struct file *fp; - dev_t dev; + udev_t dev; ino_t ino; { struct svr4_sockcache_entry *e; diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h index 8e0dc3189b20..6060b9d21275 100644 --- a/sys/compat/svr4/svr4_socket.h +++ b/sys/compat/svr4/svr4_socket.h @@ -27,6 +27,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SOCKET_H_ @@ -46,7 +48,7 @@ struct svr4_sockaddr_in { }; struct sockaddr_un *svr4_find_socket __P((struct proc *, struct file *, - dev_t, ino_t)); + udev_t, ino_t)); void svr4_delete_socket __P((struct proc *, struct file *)); int svr4_add_socket __P((struct proc *, const char *, struct stat *)); diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index 82d9996b783c..c0c9767bc6d6 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4_sockio.h b/sys/compat/svr4/svr4_sockio.h index 7ddbcf7e6dc4..f363caaddcbb 100644 --- a/sys/compat/svr4/svr4_sockio.h +++ b/sys/compat/svr4/svr4_sockio.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SOCKIO_H_ diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h index e0fe451586f5..36e0a8a24b60 100644 --- a/sys/compat/svr4/svr4_sockmod.h +++ b/sys/compat/svr4/svr4_sockmod.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SOCKMOD_H_ diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h index 30ae80844ce6..cc904abb89e3 100644 --- a/sys/compat/svr4/svr4_statvfs.h +++ b/sys/compat/svr4/svr4_statvfs.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_STATVFS_H_ diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index a656d33aa70e..b6cd6d37dc2d 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -26,6 +26,8 @@ * 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. + * + * $Id$ */ /* @@ -335,8 +337,8 @@ svr4_recvit(p, s, mp, namelenp) tocopy = len; } - if (error = copyout((caddr_t)mtod(m, caddr_t), - ctlbuf, tocopy)) + if ((error = copyout((caddr_t)mtod(m, caddr_t), + ctlbuf, tocopy)) != 0) goto out; ctlbuf += tocopy; @@ -1807,7 +1809,7 @@ svr4_sys_putmsg(p, uap) } else { /* Maybe we've been given a device/inode pair */ - dev_t *dev = SVR4_ADDROF(&sc); + udev_t *dev = SVR4_ADDROF(&sc); ino_t *ino = (ino_t *) &dev[1]; skp = svr4_find_socket(p, fp, *dev, *ino); if (skp == NULL) { diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h index 75a33b3eef98..52badbb502ef 100644 --- a/sys/compat/svr4/svr4_stropts.h +++ b/sys/compat/svr4/svr4_stropts.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_STROPTS_H_ diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h index bb1000a4922e..331fa7ebaa0f 100644 --- a/sys/compat/svr4/svr4_sysconfig.h +++ b/sys/compat/svr4/svr4_sysconfig.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SYSCONFIG_H_ diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h index 520c6fabb406..0e05a658d0b7 100644 --- a/sys/compat/svr4/svr4_systeminfo.h +++ b/sys/compat/svr4/svr4_systeminfo.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_SYSTEMINFO_H_ diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c index 90a63fedd711..646c7a591d2a 100644 --- a/sys/compat/svr4/svr4_sysvec.c +++ b/sys/compat/svr4/svr4_sysvec.c @@ -1,3 +1,35 @@ +/* + * Copyright (c) 1998 Mark Newton + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Christos Zoulas. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * + * $Id$ + */ + /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -131,7 +163,7 @@ int bsd_to_svr4_errno[ELAST+1] = { }; -static int svr4_fixup(long **stack_base, struct image_params *imgp); +static int svr4_fixup(long **stack_base, struct image_params *imgp); extern struct sysent svr4_sysent[]; #undef szsigcode @@ -153,8 +185,9 @@ struct sysentvec svr4_sysvec = { svr4_sendsig, svr4_sigcode, &svr4_szsigcode, - 0, - "SVR4" + NULL, + "SVR4", + elf_coredump }; Elf32_Brandinfo svr4_brand = { @@ -334,11 +367,6 @@ done: return error; } -/* - * XXX: wrong, for the same reason described in linux_sysvec.c - */ -static int svr4_elf_modevent __P((module_t mod, int type, void *data)); - static int svr4_elf_modevent(module_t mod, int type, void *data) { diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c index fd5db71de7e1..45525a230607 100644 --- a/sys/compat/svr4/svr4_termios.c +++ b/sys/compat/svr4/svr4_termios.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4_termios.h b/sys/compat/svr4/svr4_termios.h index a8f40ad67c52..f7eddd443667 100644 --- a/sys/compat/svr4/svr4_termios.h +++ b/sys/compat/svr4/svr4_termios.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_TERMIOS_H_ diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h index c92f4f4e755b..cc9d7a7a1865 100644 --- a/sys/compat/svr4/svr4_time.h +++ b/sys/compat/svr4/svr4_time.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_TIME_H_ diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h index 277f1f4b3cdf..7d98e05d782c 100644 --- a/sys/compat/svr4/svr4_timod.h +++ b/sys/compat/svr4/svr4_timod.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_TIMOD_H_ diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c index 691f1d6f7556..ac4c1d62c8ef 100644 --- a/sys/compat/svr4/svr4_ttold.c +++ b/sys/compat/svr4/svr4_ttold.c @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #include <sys/param.h> diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h index edc076298976..81ea51448fd5 100644 --- a/sys/compat/svr4/svr4_ttold.h +++ b/sys/compat/svr4/svr4_ttold.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_TTOLD_H_ diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h index e2bdb8231185..c37865283da6 100644 --- a/sys/compat/svr4/svr4_ucontext.h +++ b/sys/compat/svr4/svr4_ucontext.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_UCONTEXT_H_ diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h index c151da1a69f3..bd83d721abbd 100644 --- a/sys/compat/svr4/svr4_ulimit.h +++ b/sys/compat/svr4/svr4_ulimit.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_ULIMIT_H_ diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h index 89712d5a11ca..3c805a4feb43 100644 --- a/sys/compat/svr4/svr4_ustat.h +++ b/sys/compat/svr4/svr4_ustat.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_USTAT_H_ diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h index 8bbb980fd9a3..abd7b0b7a184 100644 --- a/sys/compat/svr4/svr4_util.h +++ b/sys/compat/svr4/svr4_util.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_UTIL_H_ diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h index c3afa1d9059e..e104778c9d17 100644 --- a/sys/compat/svr4/svr4_utsname.h +++ b/sys/compat/svr4/svr4_utsname.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_UTSNAME_H_ diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h index 19351632b542..2945c1948275 100644 --- a/sys/compat/svr4/svr4_wait.h +++ b/sys/compat/svr4/svr4_wait.h @@ -24,6 +24,8 @@ * 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. + * + * $Id$ */ #ifndef _SVR4_WAIT_H_ diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master index 1420318930e2..cb87fdbce939 100644 --- a/sys/compat/svr4/syscalls.master +++ b/sys/compat/svr4/syscalls.master @@ -19,7 +19,9 @@ ; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only - +; +; $Id$ +; #include <sys/types.h> #include <sys/socket.h> #include <sys/param.h> @@ -357,9 +359,9 @@ 240 STD SVR4 { int svr4_sys_send(int s, caddr_t buf, int len, int flags); } 241 NOPROTO SVR4 { ssize_t sendmsg(int s, const struct msghdr *msg, \ int flags); } -242 STD SVR4 { ssize_t svr4_sys_sendto(int s, const void *buf, \ +242 STD SVR4 { ssize_t svr4_sys_sendto(int s, void *buf, \ size_t len, int flags, \ - const struct sockaddr *to, int tolen); } + struct sockaddr *to, int tolen); } 243 NOPROTO SVR4 { int getpeername(int fdes, struct sockaddr *asa, \ int *alen); } 244 NOPROTO SVR4 { int getsockname(int fdes, struct sockaddr *asa, \ |