[Midnightbsd-cvs] src [9997] U trunk/sys/i386/ibcs2: sync ibcs2 emulation with freebsd 10
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 27 12:34:58 EDT 2018
Revision: 9997
http://svnweb.midnightbsd.org/src/?rev=9997
Author: laffer1
Date: 2018-05-27 12:34:57 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync ibcs2 emulation with freebsd 10
Modified Paths:
--------------
trunk/sys/i386/ibcs2/Makefile
trunk/sys/i386/ibcs2/coff.h
trunk/sys/i386/ibcs2/ibcs2_dirent.h
trunk/sys/i386/ibcs2/ibcs2_errno.c
trunk/sys/i386/ibcs2/ibcs2_errno.h
trunk/sys/i386/ibcs2/ibcs2_fcntl.c
trunk/sys/i386/ibcs2/ibcs2_fcntl.h
trunk/sys/i386/ibcs2/ibcs2_ioctl.c
trunk/sys/i386/ibcs2/ibcs2_ioctl.h
trunk/sys/i386/ibcs2/ibcs2_ipc.c
trunk/sys/i386/ibcs2/ibcs2_ipc.h
trunk/sys/i386/ibcs2/ibcs2_isc.c
trunk/sys/i386/ibcs2/ibcs2_isc_syscall.h
trunk/sys/i386/ibcs2/ibcs2_isc_sysent.c
trunk/sys/i386/ibcs2/ibcs2_misc.c
trunk/sys/i386/ibcs2/ibcs2_mount.h
trunk/sys/i386/ibcs2/ibcs2_msg.c
trunk/sys/i386/ibcs2/ibcs2_other.c
trunk/sys/i386/ibcs2/ibcs2_proto.h
trunk/sys/i386/ibcs2/ibcs2_signal.c
trunk/sys/i386/ibcs2/ibcs2_signal.h
trunk/sys/i386/ibcs2/ibcs2_socksys.c
trunk/sys/i386/ibcs2/ibcs2_socksys.h
trunk/sys/i386/ibcs2/ibcs2_stat.c
trunk/sys/i386/ibcs2/ibcs2_stat.h
trunk/sys/i386/ibcs2/ibcs2_statfs.h
trunk/sys/i386/ibcs2/ibcs2_stropts.h
trunk/sys/i386/ibcs2/ibcs2_syscall.h
trunk/sys/i386/ibcs2/ibcs2_sysent.c
trunk/sys/i386/ibcs2/ibcs2_sysi86.c
trunk/sys/i386/ibcs2/ibcs2_sysvec.c
trunk/sys/i386/ibcs2/ibcs2_termios.h
trunk/sys/i386/ibcs2/ibcs2_time.h
trunk/sys/i386/ibcs2/ibcs2_types.h
trunk/sys/i386/ibcs2/ibcs2_unistd.h
trunk/sys/i386/ibcs2/ibcs2_ustat.h
trunk/sys/i386/ibcs2/ibcs2_util.c
trunk/sys/i386/ibcs2/ibcs2_util.h
trunk/sys/i386/ibcs2/ibcs2_utime.h
trunk/sys/i386/ibcs2/ibcs2_utsname.h
trunk/sys/i386/ibcs2/ibcs2_xenix.c
trunk/sys/i386/ibcs2/ibcs2_xenix.h
trunk/sys/i386/ibcs2/ibcs2_xenix_syscall.h
trunk/sys/i386/ibcs2/ibcs2_xenix_sysent.c
trunk/sys/i386/ibcs2/imgact_coff.c
trunk/sys/i386/ibcs2/syscalls.conf
trunk/sys/i386/ibcs2/syscalls.isc
trunk/sys/i386/ibcs2/syscalls.isc.conf
trunk/sys/i386/ibcs2/syscalls.master
trunk/sys/i386/ibcs2/syscalls.xenix
trunk/sys/i386/ibcs2/syscalls.xenix.conf
Property Changed:
----------------
trunk/sys/i386/ibcs2/syscalls.conf
trunk/sys/i386/ibcs2/syscalls.isc
trunk/sys/i386/ibcs2/syscalls.isc.conf
trunk/sys/i386/ibcs2/syscalls.master
trunk/sys/i386/ibcs2/syscalls.xenix
trunk/sys/i386/ibcs2/syscalls.xenix.conf
Modified: trunk/sys/i386/ibcs2/Makefile
===================================================================
--- trunk/sys/i386/ibcs2/Makefile 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/Makefile 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,6 +1,7 @@
+# $MidnightBSD$
# Makefile for syscall tables
#
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/i386/ibcs2/Makefile 315063 2017-03-11 08:40:59Z dchagin $
all:
@echo "make sysent, isc_sysent or xenix_sysent only"
@@ -9,9 +10,6 @@
ibcs2_sysent.c ibcs2_syscall.h ibcs2_proto.h: ../../kern/makesyscalls.sh \
syscalls.master syscalls.conf
- -mv -f ibcs2_sysent.c ibcs2_sysent.c.bak
- -mv -f ibcs2_syscall.h ibcs2_syscall.h.bak
- -mv -f ibcs2_proto.h ibcs2_proto.h.bak
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
isc_sysent: ibcs2_isc_sysent.c ibcs2_isc_syscall.h
@@ -18,8 +16,6 @@
ibcs2_isc_sysent.c ibcs2_isc_syscall.h : ../../kern/makesyscalls.sh \
syscalls.isc syscalls.isc.conf
- -mv -f ibcs2_isc_sysent.c ibcs2_isc_sysent.c.bak
- -mv -f ibcs2_isc_syscall.h ibcs2_isc_syscall.h.bak
sh ../../kern/makesyscalls.sh syscalls.isc syscalls.isc.conf
xenix_sysent: ibcs2_xenix_sysent.c ibcs2_xenix_syscall.h ibcs2_xenix.h
@@ -26,7 +22,4 @@
ibcs2_xenix_sysent.c ibcs2_xenix_syscall.h ibcs2_xenix.h: \
../../kern/makesyscalls.sh syscalls.xenix syscalls.xenix.conf
- -mv -f ibcs2_xenix_sysent.c ibcs2_xenix_sysent.c.bak
- -mv -f ibcs2_xenix_syscall.h ibcs2_xenix_syscall.h.bak
- -mv -f ibcs2_xenix.h ibcs2_xenix.h.bak
sh ../../kern/makesyscalls.sh syscalls.xenix syscalls.xenix.conf
Modified: trunk/sys/i386/ibcs2/coff.h
===================================================================
--- trunk/sys/i386/ibcs2/coff.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/coff.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,6 +1,7 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994 Sean Eric Fagan
- * Copyright (c) 1994 S\xF8ren Schmidt
+ * Copyright (c) 1994 Søren Schmidt
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,7 +27,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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/coff.h 230132 2012-01-15 13:23:18Z uqs $
*/
#ifndef _COFF_H
Modified: trunk/sys/i386/ibcs2/ibcs2_dirent.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_dirent.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_dirent.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_dirent.h,v 1.2 1994/10/26 02:52:51 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_dirent.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_errno.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_errno.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_errno.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* ibcs2_errno.c
* Copyright (c) 1995 Scott Bartram
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_errno.c 139799 2005-01-06 23:22:04Z imp $");
#include <sys/errno.h>
#include <i386/ibcs2/ibcs2_errno.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_errno.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_errno.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_errno.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* ibcs2_errno.h
* Copyright (c) 1995 Scott Bartram
@@ -28,7 +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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_errno.h 139799 2005-01-06 23:22:04Z imp $
*/
#ifndef _IBCS2_ERRNO_H
Modified: trunk/sys/i386/ibcs2/ibcs2_fcntl.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_fcntl.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_fcntl.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
@@ -26,13 +27,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_fcntl.c 280258 2015-03-19 13:37:36Z rwatson $");
#include "opt_spx_hack.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
@@ -201,10 +202,12 @@
free(path, M_TEMP);
PROC_LOCK(p);
if (!ret && !noctty && SESS_LEADER(p) && !(p->p_flag & P_CONTROLT)) {
+ cap_rights_t rights;
struct file *fp;
int error;
- error = fget(td, td->td_retval[0], CAP_IOCTL, &fp);
+ error = fget(td, td->td_retval[0],
+ cap_rights_init(&rights, CAP_IOCTL), &fp);
PROC_UNLOCK(p);
if (error)
return (EBADF);
@@ -243,7 +246,7 @@
int error;
CHECKALTEXIST(td, uap->path, &path);
- error = kern_access(td, path, UIO_SYSSPACE, uap->flags);
+ error = kern_access(td, path, UIO_SYSSPACE, uap->amode);
free(path, M_TEMP);
return (error);
}
Modified: trunk/sys/i386/ibcs2/ibcs2_fcntl.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_fcntl.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_fcntl.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_fcntl.h,v 1.2 1994/10/26 02:52:54 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_fcntl.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_ioctl.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_ioctl.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_ioctl.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_ioctl.c,v 1.6 1995/03/14 15:12:28 scottb Exp $ */
/*-
@@ -27,11 +28,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_ioctl.c 280258 2015-03-19 13:37:36Z rwatson $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/consio.h>
#include <sys/fcntl.h>
#include <sys/file.h>
@@ -331,10 +332,12 @@
struct ibcs2_ioctl_args *uap;
{
struct proc *p = td->td_proc;
+ cap_rights_t rights;
struct file *fp;
int error;
- if ((error = fget(td, uap->fd, CAP_IOCTL, &fp)) != 0) {
+ error = fget(td, uap->fd, cap_rights_init(&rights, CAP_IOCTL), &fp);
+ if (error != 0) {
DPRINTF(("ibcs2_ioctl(%d): bad fd %d ", p->p_pid,
uap->fd));
return EBADF;
Modified: trunk/sys/i386/ibcs2/ibcs2_ioctl.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_ioctl.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_ioctl.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* misc IOCTL's */
/* Unix to Jerq I/O control */
Modified: trunk/sys/i386/ibcs2/ibcs2_ipc.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_ipc.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_ipc.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_ipc.c 225617 2011-09-16 13:58:51Z kmacy $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_ipc.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_ipc.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_ipc.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
@@ -27,7 +28,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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_ipc.h 160188 2006-07-08 19:52:49Z jhb $
*/
Modified: trunk/sys/i386/ibcs2/ibcs2_isc.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_isc.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_isc.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/*-
- * Copyright (c) 1994 S\xF8ren Schmidt
+ * Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_isc.c 230132 2012-01-15 13:23:18Z uqs $");
#include <sys/param.h>
#include <sys/lock.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_isc_syscall.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_isc_syscall.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_isc_syscall.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_isc_syscall.h 191921 2009-05-08 20:16:04Z ed $
* created from FreeBSD: head/sys/i386/ibcs2/syscalls.isc 160798 2006-07-28 19:05:28Z jhb
*/
Modified: trunk/sys/i386/ibcs2/ibcs2_isc_sysent.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_isc_sysent.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_isc_sysent.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_isc_sysent.c 225618 2011-09-16 14:04:14Z kmacy $
* created from FreeBSD: head/sys/i386/ibcs2/syscalls.isc 160798 2006-07-28 19:05:28Z jhb
*/
Modified: trunk/sys/i386/ibcs2/ibcs2_misc.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_misc.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_misc.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Steven Wallace
* Copyright (c) 1994, 1995 Scott Bartram
@@ -47,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_misc.c 331671 2018-03-28 13:44:02Z emaste $");
/*
* IBCS2 compatibility module.
@@ -57,7 +58,7 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/dirent.h>
#include <sys/fcntl.h>
#include <sys/filedesc.h>
@@ -200,15 +201,22 @@
struct ibcs2_execv_args *uap;
{
struct image_args eargs;
+ struct vmspace *oldvmspace;
char *path;
int error;
CHECKALTEXIST(td, uap->path, &path);
+ error = pre_execve(td, &oldvmspace);
+ if (error != 0) {
+ free(path, M_TEMP);
+ return (error);
+ }
error = exec_copyin_args(&eargs, path, UIO_SYSSPACE, uap->argp, NULL);
free(path, M_TEMP);
if (error == 0)
error = kern_execve(td, &eargs, NULL);
+ post_execve(td, error, oldvmspace);
return (error);
}
@@ -218,16 +226,23 @@
struct ibcs2_execve_args *uap;
{
struct image_args eargs;
+ struct vmspace *oldvmspace;
char *path;
int error;
CHECKALTEXIST(td, uap->path, &path);
+ error = pre_execve(td, &oldvmspace);
+ if (error != 0) {
+ free(path, M_TEMP);
+ return (error);
+ }
error = exec_copyin_args(&eargs, path, UIO_SYSSPACE, uap->argp,
uap->envp);
free(path, M_TEMP);
if (error == 0)
error = kern_execve(td, &eargs, NULL);
+ post_execve(td, error, oldvmspace);
return (error);
}
@@ -326,19 +341,22 @@
register int len, reclen; /* BSD-format */
register caddr_t outp; /* iBCS2-format */
register int resid; /* iBCS2-format */
+ cap_rights_t rights;
struct file *fp;
struct uio auio;
struct iovec aiov;
struct ibcs2_dirent idb;
off_t off; /* true file offset */
- int buflen, error, eofflag, vfslocked;
+ int buflen, error, eofflag;
u_long *cookies = NULL, *cookiep;
int ncookies;
#define BSD_DIRENT(cp) ((struct dirent *)(cp))
#define IBCS2_RECLEN(reclen) (reclen + sizeof(u_short))
- if ((error = getvnode(td->td_proc->p_fd, uap->fd,
- CAP_READ | CAP_SEEK, &fp)) != 0)
+ memset(&idb, 0, sizeof(idb));
+ error = getvnode(td->td_proc->p_fd, uap->fd,
+ cap_rights_init(&rights, CAP_READ), &fp);
+ if (error != 0)
return (error);
if ((fp->f_flag & FREAD) == 0) {
fdrop(fp, td);
@@ -345,9 +363,7 @@
return (EBADF);
}
vp = fp->f_vnode;
- vfslocked = VFS_LOCK_GIANT(vp->v_mount);
if (vp->v_type != VDIR) { /* XXX vnode readdir op should do this */
- VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
return (EINVAL);
}
@@ -464,7 +480,6 @@
td->td_retval[0] = uap->nbytes - resid;
out:
VOP_UNLOCK(vp, 0);
- VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
if (cookies)
free(cookies, M_TEMP);
@@ -482,6 +497,7 @@
register int len, reclen; /* BSD-format */
register caddr_t outp; /* iBCS2-format */
register int resid; /* iBCS2-format */
+ cap_rights_t rights;
struct file *fp;
struct uio auio;
struct iovec aiov;
@@ -490,12 +506,13 @@
char name[14];
} idb;
off_t off; /* true file offset */
- int buflen, error, eofflag, size, vfslocked;
+ int buflen, error, eofflag, size;
u_long *cookies = NULL, *cookiep;
int ncookies;
- if ((error = getvnode(td->td_proc->p_fd, uap->fd,
- CAP_READ | CAP_SEEK, &fp)) != 0) {
+ error = getvnode(td->td_proc->p_fd, uap->fd,
+ cap_rights_init(&rights, CAP_READ), &fp);
+ if (error != 0) {
if (error == EINVAL)
return sys_read(td, (struct read_args *)uap);
else
@@ -506,9 +523,7 @@
return (EBADF);
}
vp = fp->f_vnode;
- vfslocked = VFS_LOCK_GIANT(vp->v_mount);
if (vp->v_type != VDIR) {
- VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
return sys_read(td, (struct read_args *)uap);
}
@@ -631,7 +646,6 @@
td->td_retval[0] = uap->nbytes - resid;
out:
VOP_UNLOCK(vp, 0);
- VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
if (cookies)
free(cookies, M_TEMP);
Modified: trunk/sys/i386/ibcs2/ibcs2_mount.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_mount.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_mount.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_mount.h,v 1.2 1994/10/26 02:53:00 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_mount.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_msg.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_msg.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_msg.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_msg.c 160138 2006-07-06 21:29:05Z jhb $");
/*
* IBCS2 message compatibility module.
Modified: trunk/sys/i386/ibcs2/ibcs2_other.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_other.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_other.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_other.c 225617 2011-09-16 13:58:51Z kmacy $");
/*
* IBCS2 compatibility module.
Modified: trunk/sys/i386/ibcs2/ibcs2_proto.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_proto.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_proto.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,9 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 203660 2010-02-08 10:02:01Z ed
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_proto.h 318164 2017-05-10 23:09:17Z jhb $
*/
#ifndef _IBCS2_SYSPROTO_H_
@@ -12,8 +12,10 @@
#include <sys/signal.h>
#include <sys/acl.h>
#include <sys/cpuset.h>
+#include <sys/_ffcounter.h>
#include <sys/_semaphore.h>
#include <sys/ucontext.h>
+#include <sys/wait.h>
#include <bsm/audit_kevents.h>
@@ -120,7 +122,7 @@
};
struct ibcs2_access_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char amode_l_[PADL_(int)]; int amode; char amode_r_[PADR_(int)];
};
struct ibcs2_nice_args {
char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)];
Modified: trunk/sys/i386/ibcs2/ibcs2_signal.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_signal.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_signal.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_signal.c 225617 2011-09-16 13:58:51Z kmacy $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_signal.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_signal.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_signal.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_signal.h,v 1.7 1995/08/14 02:26:01 mycroft Exp $ */
/*-
@@ -29,7 +30,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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_signal.h 139799 2005-01-06 23:22:04Z imp $
*/
#ifndef _IBCS2_SIGNAL_H
Modified: trunk/sys/i386/ibcs2/ibcs2_socksys.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_socksys.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_socksys.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1994 Arne H Juul
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_socksys.c 229272 2012-01-02 12:12:10Z ed $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,7 +153,7 @@
/* Get the domain name. */
getcredhostname(td->td_ucred, hname, sizeof(hname));
- dptr = index(hname, '.');
+ dptr = strchr(hname, '.');
if ( dptr )
dptr++;
else
@@ -182,7 +183,7 @@
return EINVAL;
/* Get the host's unqualified name (strip off the domain) */
- ptr = index(hname, '.');
+ ptr = strchr(hname, '.');
if ( ptr != NULL ) {
ptr++;
*ptr = '\0';
Modified: trunk/sys/i386/ibcs2/ibcs2_socksys.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_socksys.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_socksys.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1994 Arne H Juul
@@ -22,7 +23,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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_socksys.h 139799 2005-01-06 23:22:04Z imp $
*/
#ifndef _I386_IBCS2_IBCS2_SOCKSYS_H_
Modified: trunk/sys/i386/ibcs2/ibcs2_stat.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_stat.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_stat.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_stat.c 229272 2012-01-02 12:12:10Z ed $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,7 +213,7 @@
IBCS2_UNAME_VERSION, sizeof(sut.version) - 1);
getcredhostname(td->td_ucred, machine_name,
sizeof(machine_name) - 1);
- p = index(machine_name, '.');
+ p = strchr(machine_name, '.');
if ( p )
*p = '\0';
strncpy(sut.nodename, machine_name, sizeof(sut.nodename) - 1);
Modified: trunk/sys/i386/ibcs2/ibcs2_stat.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_stat.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_stat.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_stat.h,v 1.2 1994/10/26 02:53:03 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_stat.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_statfs.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_statfs.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_statfs.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_statfs.h,v 1.2 1994/10/26 02:53:06 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_statfs.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_stropts.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_stropts.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_stropts.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* ibcs2_stropts.h
* Copyright (c) 1995 Scott Bartram
@@ -22,7 +23,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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_stropts.h 139799 2005-01-06 23:22:04Z imp $
*/
#ifndef _IBCS2_STROPTS_H
Modified: trunk/sys/i386/ibcs2/ibcs2_syscall.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_syscall.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_syscall.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,9 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 203660 2010-02-08 10:02:01Z ed
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_syscall.h 318164 2017-05-10 23:09:17Z jhb $
*/
#define IBCS2_SYS_syscall 0
Modified: trunk/sys/i386/ibcs2/ibcs2_sysent.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_sysent.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_sysent.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,9 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 203660 2010-02-08 10:02:01Z ed
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_sysent.c 318164 2017-05-10 23:09:17Z jhb $
*/
#include <sys/param.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_sysi86.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_sysi86.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_sysi86.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/*-
- * Copyright (c) 1994 S\xF8ren Schmidt
+ * Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_sysi86.c 230132 2012-01-15 13:23:18Z uqs $");
#include <sys/param.h>
#include <sys/lock.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_sysvec.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_sysvec.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_sysvec.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_sysvec.c 294136 2016-01-16 07:56:49Z dchagin $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -54,8 +55,6 @@
extern int bsd_to_ibcs2_errno[];
extern struct sysent ibcs2_sysent[IBCS2_SYS_MAXSYSCALL];
-extern int szsigcode;
-extern char sigcode[];
static int ibcs2_fixup(register_t **, struct image_params *);
struct sysentvec ibcs2_svr3_sysvec = {
@@ -91,6 +90,8 @@
.sv_fetch_syscall_args = cpu_fetch_syscall_args,
.sv_syscallnames = NULL,
.sv_schedtail = NULL,
+ .sv_thread_detach = NULL,
+ .sv_trap = NULL,
};
static int
Modified: trunk/sys/i386/ibcs2/ibcs2_termios.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_termios.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_termios.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_termios.h,v 1.3 1994/10/26 02:53:07 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_termios.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_time.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_time.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_time.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_time.h,v 1.2 1994/10/26 02:53:08 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_time.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_types.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_types.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_types.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_types.h,v 1.5 1995/08/14 01:11:54 mycroft Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_types.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_unistd.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_unistd.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_unistd.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_unistd.h,v 1.2 1994/10/26 02:53:11 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_unistd.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_ustat.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_ustat.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_ustat.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_ustat.h,v 1.2 1994/10/26 02:53:13 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_ustat.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_util.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_util.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_util.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_util.c 177997 2008-04-08 09:45:49Z kib $");
#include <sys/fcntl.h>
#include <sys/param.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_util.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_util.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_util.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
@@ -29,7 +30,7 @@
* from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
* from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_util.h 160241 2006-07-10 17:59:26Z jhb $
*/
/*
Modified: trunk/sys/i386/ibcs2/ibcs2_utime.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_utime.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_utime.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
@@ -27,7 +28,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.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_utime.h 139799 2005-01-06 23:22:04Z imp $
*/
#ifndef _IBCS2_UTIME_H
Modified: trunk/sys/i386/ibcs2/ibcs2_utsname.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_utsname.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_utsname.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/* $NetBSD: ibcs2_utsname.h,v 1.2 1994/10/26 02:53:14 cgd Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_utsname.h 139799 2005-01-06 23:22:04Z imp $ */
/*-
* Copyright (c) 1994 Scott Bartram
Modified: trunk/sys/i386/ibcs2/ibcs2_xenix.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_xenix.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_xenix.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,6 +1,7 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994 Sean Eric Fagan
- * Copyright (c) 1994 S\xF8ren Schmidt
+ * Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_xenix.c 230132 2012-01-15 13:23:18Z uqs $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/i386/ibcs2/ibcs2_xenix.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_xenix.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_xenix.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_xenix.h 225618 2011-09-16 14:04:14Z kmacy $
* created from FreeBSD: head/sys/i386/ibcs2/syscalls.xenix 160798 2006-07-28 19:05:28Z jhb
*/
Modified: trunk/sys/i386/ibcs2/ibcs2_xenix_syscall.h
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_xenix_syscall.h 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_xenix_syscall.h 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_xenix_syscall.h 191921 2009-05-08 20:16:04Z ed $
* created from FreeBSD: head/sys/i386/ibcs2/syscalls.xenix 160798 2006-07-28 19:05:28Z jhb
*/
Modified: trunk/sys/i386/ibcs2/ibcs2_xenix_sysent.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_xenix_sysent.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/ibcs2_xenix_sysent.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,8 +1,9 @@
+/* $MidnightBSD$ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/i386/ibcs2/ibcs2_xenix_sysent.c 225618 2011-09-16 14:04:14Z kmacy $
* created from FreeBSD: head/sys/i386/ibcs2/syscalls.xenix 160798 2006-07-28 19:05:28Z jhb
*/
Modified: trunk/sys/i386/ibcs2/imgact_coff.c
===================================================================
--- trunk/sys/i386/ibcs2/imgact_coff.c 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/imgact_coff.c 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,6 +1,7 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1994 Sean Eric Fagan
- * Copyright (c) 1994 S\xF8ren Schmidt
+ * Copyright (c) 1994 Søren Schmidt
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/i386/ibcs2/imgact_coff.c 255426 2013-09-09 18:11:59Z jhb $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +129,7 @@
if (map_len != 0) {
error = vm_map_find(&vmspace->vm_map, NULL, 0, &map_addr,
- map_len, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
+ map_len, 0, VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
if (error)
return (vm_mmap_to_errno(error));
}
@@ -146,7 +147,7 @@
error = copyout(data_buf, (caddr_t) map_addr, copy_len);
- kmem_free_wakeup(exec_map, (vm_offset_t)data_buf, PAGE_SIZE);
+ kmap_free_wakeup(exec_map, (vm_offset_t)data_buf, PAGE_SIZE);
return error;
}
@@ -280,7 +281,7 @@
error = 0;
dealloc_and_fail:
- kmem_free_wakeup(exec_map, (vm_offset_t)ptr, PAGE_SIZE);
+ kmap_free_wakeup(exec_map, (vm_offset_t)ptr, PAGE_SIZE);
fail:
VOP_UNLOCK(vp, 0);
unlocked_fail:
@@ -417,7 +418,7 @@
}
free(libbuf, M_TEMP);
}
- kmem_free_wakeup(exec_map, (vm_offset_t)buf, len);
+ kmap_free_wakeup(exec_map, (vm_offset_t)buf, len);
if (error)
goto fail;
}
@@ -473,7 +474,7 @@
DPRINTF(("imgact: error = %d\n", error));
vm_map_find(&vmspace->vm_map, NULL, 0,
- (vm_offset_t *)&hole, PAGE_SIZE, VMFS_NO_SPACE,
+ (vm_offset_t *)&hole, PAGE_SIZE, 0, VMFS_NO_SPACE,
VM_PROT_ALL, VM_PROT_ALL, 0);
DPRINTF(("IBCS2: start vm_dsize = 0x%x, vm_daddr = 0x%p end = 0x%p\n",
ctob(vmspace->vm_dsize), vmspace->vm_daddr,
Modified: trunk/sys/i386/ibcs2/syscalls.conf
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.conf 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/syscalls.conf 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,4 +1,4 @@
-# syscalls.conf $FreeBSD$
+# syscalls.conf $FreeBSD: stable/10/sys/i386/ibcs2/syscalls.conf 161328 2006-08-15 17:25:55Z jhb $
sysnames="/dev/null"
sysproto="ibcs2_proto.h"
sysproto_h=_IBCS2_SYSPROTO_H_
Property changes on: trunk/sys/i386/ibcs2/syscalls.conf
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidightBSD=%H
\ No newline at end of property
Modified: trunk/sys/i386/ibcs2/syscalls.isc
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.isc 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/syscalls.isc 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: stable/10/sys/i386/ibcs2/syscalls.isc 160798 2006-07-28 19:05:28Z jhb $
#include <sys/param.h>
#include <sys/sysent.h>
Property changes on: trunk/sys/i386/ibcs2/syscalls.isc
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidightBSD=%H
\ No newline at end of property
Modified: trunk/sys/i386/ibcs2/syscalls.isc.conf
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.isc.conf 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/syscalls.isc.conf 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,4 +1,4 @@
-# syscalls.conf $FreeBSD$
+# syscalls.conf $FreeBSD: stable/10/sys/i386/ibcs2/syscalls.isc.conf 161328 2006-08-15 17:25:55Z jhb $
sysnames="/dev/null"
#sysproto="ibcs2_isc.h"
sysproto="/dev/null"
Property changes on: trunk/sys/i386/ibcs2/syscalls.isc.conf
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidightBSD=%H
\ No newline at end of property
Modified: trunk/sys/i386/ibcs2/syscalls.master
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.master 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/syscalls.master 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: stable/10/sys/i386/ibcs2/syscalls.master 227691 2011-11-19 06:35:15Z ed $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from IBCS2).
@@ -80,7 +80,7 @@
struct ibcs2_utimbuf *buf); }
31 AUE_NULL UNIMPL ibcs2_stty
32 AUE_NULL UNIMPL ibcs2_gtty
-33 AUE_ACCESS STD { int ibcs2_access(char *path, int flags); }
+33 AUE_ACCESS STD { int ibcs2_access(char *path, int amode); }
34 AUE_NICE STD { int ibcs2_nice(int incr); }
35 AUE_STATFS STD { int ibcs2_statfs(char *path, \
struct ibcs2_statfs *buf, int len, \
Property changes on: trunk/sys/i386/ibcs2/syscalls.master
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidightBSD=%H
\ No newline at end of property
Modified: trunk/sys/i386/ibcs2/syscalls.xenix
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.xenix 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/syscalls.xenix 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: stable/10/sys/i386/ibcs2/syscalls.xenix 160798 2006-07-28 19:05:28Z jhb $
#include <sys/param.h>
#include <sys/sysent.h>
Property changes on: trunk/sys/i386/ibcs2/syscalls.xenix
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidightBSD=%H
\ No newline at end of property
Modified: trunk/sys/i386/ibcs2/syscalls.xenix.conf
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.xenix.conf 2018-05-27 16:34:34 UTC (rev 9996)
+++ trunk/sys/i386/ibcs2/syscalls.xenix.conf 2018-05-27 16:34:57 UTC (rev 9997)
@@ -1,4 +1,4 @@
-# syscalls.conf $FreeBSD$
+# syscalls.conf $FreeBSD: stable/10/sys/i386/ibcs2/syscalls.xenix.conf 161328 2006-08-15 17:25:55Z jhb $
sysnames="/dev/null"
sysproto="ibcs2_xenix.h"
sysproto_h=_IBCS2_XENIX_H_
Property changes on: trunk/sys/i386/ibcs2/syscalls.xenix.conf
___________________________________________________________________
Added: mnbsd:nokeywords
## -0,0 +1 ##
+MidightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list