In order to maximize the re-usability of kernel code in user space this

patch modifies makesyscalls.sh to prefix all of the non-compatibility
calls (e.g. not linux_, freebsd32_) with sys_ and updates the kernel
entry points and all places in the code that use them. It also
fixes an additional name space collision between the kernel function
psignal and the libc function of the same name by renaming the kernel
psignal kern_psignal(). By introducing this change now we will ease future
MFCs that change syscalls.

Reviewed by:	rwatson
Approved by:	re (bz)

7 files changed, 68 insertions, 68 deletions

diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 3a582ce..83e68cd 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -499,12 +499,12 @@ ibcs2_ioctl(td, uap)
 
 	case IBCS2_TIOCGWINSZ:
 		uap->cmd = TIOCGWINSZ;
-		error = ioctl(td, (struct ioctl_args *)uap);
+		error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_TIOCSWINSZ:
 		uap->cmd = TIOCSWINSZ;
-		error = ioctl(td, (struct ioctl_args *)uap);
+		error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_TIOCGPGRP:
@@ -525,7 +525,7 @@ ibcs2_ioctl(td, uap)
 
 		sa.pid = 0;
 		sa.pgid = (int)uap->data;
-		error = setpgid(td, &sa);
+		error = sys_setpgid(td, &sa);
 		break;
 	    }
 
@@ -565,103 +565,103 @@ ibcs2_ioctl(td, uap)
 	case IBCS2_KDGKBMODE:        /* get keyboard translation mode */
 	        uap->cmd = KDGKBMODE;
 /* printf("ioctl KDGKBMODE = %x\n", uap->cmd);*/
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDSKBMODE:        /* set keyboard translation mode */
 	        uap->cmd = KDSKBMODE;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDMKTONE:        /* sound tone */
 	        uap->cmd = KDMKTONE;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDGETMODE:        /* get text/graphics mode */  
 	        uap->cmd = KDGETMODE;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDSETMODE:       /* set text/graphics mode */
 	        uap->cmd = KDSETMODE;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDSBORDER:       /* set ega color border */
 	        uap->cmd = KDSBORDER;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDGKBSTATE:
 	        uap->cmd = KDGKBSTATE;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDSETRAD:
 	        uap->cmd = KDSETRAD;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDENABIO:       /* enable direct I/O to ports */
 	        uap->cmd = KDENABIO;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDDISABIO:       /* disable direct I/O to ports */
 	        uap->cmd = KDDISABIO;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KIOCSOUND:       /* start sound generation */
 	        uap->cmd = KIOCSOUND;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDGKBTYPE:       /* get keyboard type */
 	        uap->cmd = KDGKBTYPE;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDGETLED:       /* get keyboard LED status */
 	        uap->cmd = KDGETLED;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_KDSETLED:       /* set keyboard LED status */
 	        uap->cmd = KDSETLED;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	    /* Xenix keyboard and display ioctl's from sys/kd.h -- type 'k' */
 	case IBCS2_GETFKEY:      /* Get function key */
 	        uap->cmd = GETFKEY;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_SETFKEY:      /* Set function key */
 	        uap->cmd = SETFKEY;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_GIO_SCRNMAP:      /* Get screen output map table */
 	        uap->cmd = GIO_SCRNMAP;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_PIO_SCRNMAP:      /* Set screen output map table */
 	        uap->cmd = PIO_SCRNMAP;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_GIO_KEYMAP:      /* Get keyboard map table */
 	        uap->cmd = OGIO_KEYMAP;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	case IBCS2_PIO_KEYMAP:      /* Set keyboard map table */
 	        uap->cmd = OPIO_KEYMAP;
-	        error = ioctl(td, (struct ioctl_args *)uap);
+	        error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	    /* socksys */
@@ -672,7 +672,7 @@ ibcs2_ioctl(td, uap)
 	case IBCS2_FIONREAD:
 	case IBCS2_I_NREAD:     /* STREAMS */
 	        uap->cmd = FIONREAD;
-		error = ioctl(td, (struct ioctl_args *)uap);
+		error = sys_ioctl(td, (struct ioctl_args *)uap);
 		break;
 
 	default:
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index c76c0e4..4bf3dd1 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -118,7 +118,7 @@ ibcs2_msgget(struct thread *td, void *v)
 
 	ap.key = uap->key;
 	ap.msgflg = uap->msgflg;
-	return msgget(td, &ap);
+	return sys_msgget(td, &ap);
 }
 
 struct ibcs2_msgctl_args {
@@ -176,7 +176,7 @@ ibcs2_msgrcv(struct thread *td, void *v)
 	ap.msgsz = uap->msgsz;
 	ap.msgtyp = uap->msgtyp;
 	ap.msgflg = uap->msgflg;
-	return (msgrcv(td, &ap));
+	return (sys_msgrcv(td, &ap));
 }
 
 struct ibcs2_msgsnd_args {
@@ -197,7 +197,7 @@ ibcs2_msgsnd(struct thread *td, void *v)
 	ap.msgp = uap->msgp;
 	ap.msgsz = uap->msgsz;
 	ap.msgflg = uap->msgflg;
-	return (msgsnd(td, &ap));
+	return (sys_msgsnd(td, &ap));
 }
 
 int
@@ -363,7 +363,7 @@ ibcs2_semget(struct thread *td, void *v)
 	ap.key = uap->key;
 	ap.nsems = uap->nsems;
 	ap.semflg = uap->semflg;
-	return (semget(td, &ap));
+	return (sys_semget(td, &ap));
 }
 
 struct ibcs2_semop_args {
@@ -382,7 +382,7 @@ ibcs2_semop(struct thread *td, void *v)
 	ap.semid = uap->semid;
 	ap.sops = uap->sops;
 	ap.nsops = uap->nsops;
-	return (semop(td, &ap));
+	return (sys_semop(td, &ap));
 }
 
 int
@@ -459,7 +459,7 @@ ibcs2_shmat(struct thread *td, void *v)
 	ap.shmid = uap->shmid;
 	ap.shmaddr = uap->shmaddr;
 	ap.shmflg = uap->shmflg;
-	return (shmat(td, &ap));
+	return (sys_shmat(td, &ap));
 }
 
 struct ibcs2_shmctl_args {
@@ -514,7 +514,7 @@ ibcs2_shmdt(struct thread *td, void *v)
 	struct shmdt_args ap;
 
 	ap.shmaddr = uap->shmaddr;
-	return (shmdt(td, &ap));
+	return (sys_shmdt(td, &ap));
 }
 
 struct ibcs2_shmget_args {
@@ -533,7 +533,7 @@ ibcs2_shmget(struct thread *td, void *v)
 	ap.key = uap->key;
 	ap.size = uap->size;
 	ap.shmflg = uap->shmflg;
-	return (shmget(td, &ap));
+	return (sys_shmget(td, &ap));
 }
 
 int
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index a08fdf3..b72d252 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -240,7 +240,7 @@ ibcs2_umount(td, uap)
 
 	um.path = uap->name;
 	um.flags = 0;
-	return unmount(td, &um);
+	return sys_unmount(td, &um);
 }
 
 int
@@ -497,7 +497,7 @@ ibcs2_read(td, uap)
 	if ((error = getvnode(td->td_proc->p_fd, uap->fd,
 	    CAP_READ | CAP_SEEK, &fp)) != 0) {
 		if (error == EINVAL)
-			return read(td, (struct read_args *)uap);
+			return sys_read(td, (struct read_args *)uap);
 		else
 			return error;
 	}
@@ -510,7 +510,7 @@ ibcs2_read(td, uap)
 	if (vp->v_type != VDIR) {
 		VFS_UNLOCK_GIANT(vfslocked);
 		fdrop(fp, td);
-		return read(td, (struct read_args *)uap);
+		return sys_read(td, (struct read_args *)uap);
 	}
 
 	off = fp->f_offset;
@@ -731,7 +731,7 @@ ibcs2_setuid(td, uap)
 	struct setuid_args sa;
 
 	sa.uid = (uid_t)uap->uid;
-	return setuid(td, &sa);
+	return sys_setuid(td, &sa);
 }
 
 int
@@ -742,7 +742,7 @@ ibcs2_setgid(td, uap)
 	struct setgid_args sa;
 
 	sa.gid = (gid_t)uap->gid;
-	return setgid(td, &sa);
+	return sys_setgid(td, &sa);
 }
 
 int
@@ -782,7 +782,7 @@ ibcs2_fpathconf(td, uap)
 	struct ibcs2_fpathconf_args *uap;
 {
 	uap->name++;	/* iBCS2 _PC_* defines are offset by one */
-        return fpathconf(td, (struct fpathconf_args *)uap);
+        return sys_fpathconf(td, (struct fpathconf_args *)uap);
 }
 
 int
@@ -961,7 +961,7 @@ ibcs2_nice(td, uap)
 	sa.which = PRIO_PROCESS;
 	sa.who = 0;
 	sa.prio = td->td_proc->p_nice + uap->incr;
-	if ((error = setpriority(td, &sa)) != 0)
+	if ((error = sys_setpriority(td, &sa)) != 0)
 		return EPERM;
 	td->td_retval[0] = td->td_proc->p_nice;
 	return 0;
@@ -990,7 +990,7 @@ ibcs2_pgrpsys(td, uap)
 
 		sa.pid = 0;
 		sa.pgid = 0;
-		setpgid(td, &sa);
+		sys_setpgid(td, &sa);
 		PROC_LOCK(p);
 		td->td_retval[0] = p->p_pgrp->pg_id;
 		PROC_UNLOCK(p);
@@ -1003,11 +1003,11 @@ ibcs2_pgrpsys(td, uap)
 
 		sa.pid = uap->pid;
 		sa.pgid = uap->pgid;
-		return setpgid(td, &sa);
+		return sys_setpgid(td, &sa);
 	    }
 
 	case 3:			/* setsid */
-		return setsid(td, NULL);
+		return sys_setsid(td, NULL);
 
 	default:
 		return EINVAL;
@@ -1082,11 +1082,11 @@ ibcs2_uadmin(td, uap)
 		case SCO_AD_PWRDOWN:
 		case SCO_AD_PWRNAP:
 			r.opt = RB_HALT;
-			return (reboot(td, &r));
+			return (sys_reboot(td, &r));
 		case SCO_AD_BOOT:
 		case SCO_AD_IBOOT:
 			r.opt = RB_AUTOBOOT;
-			return (reboot(td, &r));
+			return (sys_reboot(td, &r));
 		}
 		return EINVAL;
 	case SCO_A_REMOUNT:
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 9013af4..f688661 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -75,7 +75,7 @@ ibcs2_lseek(struct thread *td, register struct ibcs2_lseek_args *uap)
 	largs.fd = uap->fd;
 	largs.offset = uap->offset;
 	largs.whence = uap->whence;
-	error = lseek(td, &largs);
+	error = sys_lseek(td, &largs);
 	return (error);
 }
 
@@ -95,7 +95,7 @@ spx_open(struct thread *td)
 	sock.domain = AF_UNIX;
 	sock.type = SOCK_STREAM;
 	sock.protocol = 0;
-	error = socket(td, &sock);
+	error = sys_socket(td, &sock);
 	if (error)
 		return error;
 	fd = td->td_retval[0];
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index b2f3393..6776df1 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -437,5 +437,5 @@ ibcs2_kill(td, uap)
 		return (EINVAL);
 	ka.pid = uap->pid;
 	ka.signum = ibcs2_to_bsd_sig[_SIG_IDX(uap->signo)];
-	return kill(td, &ka);
+	return sys_kill(td, &ka);
 }
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index eb0559e..ce96fc9 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -81,55 +81,55 @@ ibcs2_socksys(td, uap)
 	passargs = (void *)(realargs + 1);
 	switch (realargs[0]) {
 	case SOCKSYS_ACCEPT:
-		return accept(td, passargs);
+		return sys_accept(td, passargs);
 	case SOCKSYS_BIND:
-		return bind(td, passargs);
+		return sys_bind(td, passargs);
 	case SOCKSYS_CONNECT:
-		return connect(td, passargs);
+		return sys_connect(td, passargs);
 	case SOCKSYS_GETPEERNAME:
-		return getpeername(td, passargs);
+		return sys_getpeername(td, passargs);
 	case SOCKSYS_GETSOCKNAME:
-		return getsockname(td, passargs);
+		return sys_getsockname(td, passargs);
 	case SOCKSYS_GETSOCKOPT:
-		return getsockopt(td, passargs);
+		return sys_getsockopt(td, passargs);
 	case SOCKSYS_LISTEN:
-		return listen(td, passargs);
+		return sys_listen(td, passargs);
 	case SOCKSYS_RECV:
 		realargs[5] = realargs[6] = 0;
 		/* FALLTHROUGH */
 	case SOCKSYS_RECVFROM:
-		return recvfrom(td, passargs);
+		return sys_recvfrom(td, passargs);
 	case SOCKSYS_SEND:
 		realargs[5] = realargs[6] = 0;
 		/* FALLTHROUGH */
 	case SOCKSYS_SENDTO:
-		return sendto(td, passargs);
+		return sys_sendto(td, passargs);
 	case SOCKSYS_SETSOCKOPT:
-		return setsockopt(td, passargs);
+		return sys_setsockopt(td, passargs);
 	case SOCKSYS_SHUTDOWN:
-		return shutdown(td, passargs);
+		return sys_shutdown(td, passargs);
 	case SOCKSYS_SOCKET:
-		return socket(td, passargs);
+		return sys_socket(td, passargs);
 	case SOCKSYS_SELECT:
-		return select(td, passargs);
+		return sys_select(td, passargs);
 	case SOCKSYS_GETIPDOMAIN:
 		return ibcs2_getipdomainname(td, passargs);
 	case SOCKSYS_SETIPDOMAIN:
 		return ibcs2_setipdomainname(td, passargs);
 	case SOCKSYS_ADJTIME:
-		return adjtime(td, passargs);
+		return sys_adjtime(td, passargs);
 	case SOCKSYS_SETREUID:
-		return setreuid(td, passargs);
+		return sys_setreuid(td, passargs);
 	case SOCKSYS_SETREGID:
-		return setregid(td, passargs);
+		return sys_setregid(td, passargs);
 	case SOCKSYS_GETTIME:
-		return gettimeofday(td, passargs);
+		return sys_gettimeofday(td, passargs);
 	case SOCKSYS_SETTIME:
-		return settimeofday(td, passargs);
+		return sys_settimeofday(td, passargs);
 	case SOCKSYS_GETITIMER:
-		return getitimer(td, passargs);
+		return sys_getitimer(td, passargs);
 	case SOCKSYS_SETITIMER:
-		return setitimer(td, passargs);
+		return sys_setitimer(td, passargs);
 
 	default:
 		printf("socksys unknown %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 5b418c4..74abbb1 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -103,7 +103,7 @@ xenix_chsize(td, uap)
 	DPRINTF(("IBCS2: 'xenix chsize'\n"));
 	sa.fd = uap->fd;
 	sa.length = uap->size;
-	return ftruncate(td, &sa);
+	return sys_ftruncate(td, &sa);
 }