Author: brooks
Date: Thu Jun 23 00:30:09 2016
New Revision: 302097
URL: https://svnweb.freebsd.org/changeset/base/302097
Log:
Regen post r302096 and implement svr4_pipe().
Approved by: re (implict, fixing build)
Sponsored by: DARPA, AFRL
Modified:
head/sys/compat/svr4/svr4_filio.c
head/sys/compat/svr4/svr4_proto.h
head/sys/compat/svr4/svr4_syscall.h
head/sys/compat/svr4/svr4_syscallnames.c
head/sys/compat/svr4/svr4_sysent.c
Modified: head/sys/compat/svr4/svr4_filio.c
==============================================================================
--- head/sys/compat/svr4/svr4_filio.c Thu Jun 23 00:29:03 2016
(r302096)
+++ head/sys/compat/svr4/svr4_filio.c Thu Jun 23 00:30:09 2016
(r302097)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/sysproto.h>
+#include <sys/syscallsubr.h>
#include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_types.h>
@@ -250,3 +251,19 @@ svr4_fil_ioctl(fp, td, retval, fd, cmd,
return 0; /* ENOSYS really */
}
}
+
+int
+svr4_pipe(struct thread *td, struct svr4_pipe_args *uap) {
+ int error;
+ int fildes[2];
+
+ error = kern_pipe(td, fildes, 0, NULL, NULL);
+ if (error)
+ return (error);
+
+ td->td_retval[0] = fildes[0];
+ td->td_retval[1] = fildes[1];
+
+ return (0);
+}
+
Modified: head/sys/compat/svr4/svr4_proto.h
==============================================================================
--- head/sys/compat/svr4/svr4_proto.h Thu Jun 23 00:29:03 2016
(r302096)
+++ head/sys/compat/svr4/svr4_proto.h Thu Jun 23 00:30:09 2016
(r302097)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/svr4/syscalls.master 227691
2011-11-19 06:35:15Z ed
+ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 302096
2016-06-23 00:29:03Z brooks
*/
#ifndef _SVR4_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>
@@ -93,6 +95,9 @@ struct svr4_sys_pgrpsys_args {
char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
char pgid_l_[PADL_(int)]; int pgid; char pgid_r_[PADR_(int)];
};
+struct svr4_pipe_args {
+ register_t dummy;
+};
struct svr4_sys_times_args {
char tp_l_[PADL_(struct tms *)]; struct tms * tp; char
tp_r_[PADR_(struct tms *)];
};
@@ -422,6 +427,7 @@ int svr4_sys_access(struct thread *, str
int svr4_sys_nice(struct thread *, struct svr4_sys_nice_args *);
int svr4_sys_kill(struct thread *, struct svr4_sys_kill_args *);
int svr4_sys_pgrpsys(struct thread *, struct svr4_sys_pgrpsys_args *);
+int svr4_pipe(struct thread *, struct svr4_pipe_args *);
int svr4_sys_times(struct thread *, struct svr4_sys_times_args *);
int svr4_sys_signal(struct thread *, struct svr4_sys_signal_args *);
int svr4_sys_msgsys(struct thread *, struct svr4_sys_msgsys_args *);
@@ -509,6 +515,12 @@ int svr4_sys_sendto(struct thread *, str
#endif /* COMPAT_FREEBSD7 */
+
+#ifdef COMPAT_FREEBSD10
+
+
+#endif /* COMPAT_FREEBSD10 */
+
#define SVR4_SYS_AUE_svr4_sys_open AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_wait AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_creat AUE_NULL
@@ -525,6 +537,7 @@ int svr4_sys_sendto(struct thread *, str
#define SVR4_SYS_AUE_svr4_sys_nice AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_kill AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_pgrpsys AUE_NULL
+#define SVR4_SYS_AUE_svr4_pipe AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_times AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_signal AUE_NULL
#define SVR4_SYS_AUE_svr4_sys_msgsys AUE_NULL
Modified: head/sys/compat/svr4/svr4_syscall.h
==============================================================================
--- head/sys/compat/svr4/svr4_syscall.h Thu Jun 23 00:29:03 2016
(r302096)
+++ head/sys/compat/svr4/svr4_syscall.h Thu Jun 23 00:30:09 2016
(r302097)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/svr4/syscalls.master 227691
2011-11-19 06:35:15Z ed
+ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 302096
2016-06-23 00:29:03Z brooks
*/
#define SVR4_SYS_exit 1
@@ -38,7 +38,7 @@
#define SVR4_SYS_svr4_sys_kill 37
#define SVR4_SYS_svr4_sys_pgrpsys 39
#define SVR4_SYS_dup 41
-#define SVR4_SYS_pipe 42
+#define SVR4_SYS_svr4_pipe 42
#define SVR4_SYS_svr4_sys_times 43
#define SVR4_SYS_setgid 46
#define SVR4_SYS_getgid 47
Modified: head/sys/compat/svr4/svr4_syscallnames.c
==============================================================================
--- head/sys/compat/svr4/svr4_syscallnames.c Thu Jun 23 00:29:03 2016
(r302096)
+++ head/sys/compat/svr4/svr4_syscallnames.c Thu Jun 23 00:30:09 2016
(r302097)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/svr4/syscalls.master 227691
2011-11-19 06:35:15Z ed
+ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 302096
2016-06-23 00:29:03Z brooks
*/
const char *svr4_syscallnames[] = {
@@ -49,7 +49,7 @@ const char *svr4_syscallnames[] = {
"svr4_sys_pgrpsys", /* 39 = svr4_sys_pgrpsys */
"#40", /* 40 = xenix */
"dup", /* 41 = dup */
- "pipe", /* 42 = pipe */
+ "svr4_pipe", /* 42 = svr4_pipe */
"svr4_sys_times", /* 43 = svr4_sys_times */
"#44", /* 44 = profil */
"#45", /* 45 = plock */
Modified: head/sys/compat/svr4/svr4_sysent.c
==============================================================================
--- head/sys/compat/svr4/svr4_sysent.c Thu Jun 23 00:29:03 2016
(r302096)
+++ head/sys/compat/svr4/svr4_sysent.c Thu Jun 23 00:30:09 2016
(r302097)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/svr4/syscalls.master 227691
2011-11-19 06:35:15Z ed
+ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 302096
2016-06-23 00:29:03Z brooks
*/
#include <sys/types.h>
@@ -61,7 +61,7 @@ struct sysent svr4_sysent[] = {
{ AS(svr4_sys_pgrpsys_args), (sy_call_t *)svr4_sys_pgrpsys, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 39 = svr4_sys_pgrpsys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 40 = xenix */
{ AS(dup_args), (sy_call_t *)sys_dup, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 41 = dup */
- { 0, (sy_call_t *)sys_pipe, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 42 = pipe */
+ { 0, (sy_call_t *)svr4_pipe, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 42 = svr4_pipe */
{ AS(svr4_sys_times_args), (sy_call_t *)svr4_sys_times, AUE_NULL, NULL,
0, 0, 0, SY_THR_STATIC }, /* 43 = svr4_sys_times */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 44 = profil */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 45 = plock */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
