svn commit: r247326 - in user/dchagin/lemul/sys: amd64/linux32 compat/linux i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Tue Feb 26 18:07:31 UTC 2013
Author: dchagin
Date: Tue Feb 26 18:07:29 2013
New Revision: 247326
URL: http://svnweb.freebsd.org/changeset/base/247326
Log:
Implement dup3() system call.
Modified:
user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c
user/dchagin/lemul/sys/amd64/linux32/syscalls.master
user/dchagin/lemul/sys/compat/linux/linux_file.c
user/dchagin/lemul/sys/i386/linux/linux_dummy.c
user/dchagin/lemul/sys/i386/linux/syscalls.master
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c Tue Feb 26 17:49:06 2013 (r247325)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c Tue Feb 26 18:07:29 2013 (r247326)
@@ -128,7 +128,6 @@ DUMMY(timerfd_gettime);
DUMMY(signalfd4);
DUMMY(eventfd2);
DUMMY(epoll_create1);
-DUMMY(dup3);
DUMMY(inotify_init1);
/* linux 2.6.30: */
DUMMY(preadv);
Modified: user/dchagin/lemul/sys/amd64/linux32/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/syscalls.master Tue Feb 26 17:49:06 2013 (r247325)
+++ user/dchagin/lemul/sys/amd64/linux32/syscalls.master Tue Feb 26 18:07:29 2013 (r247326)
@@ -536,7 +536,8 @@
327 AUE_NULL STD { int linux_signalfd4(void); }
328 AUE_NULL STD { int linux_eventfd2(void); }
329 AUE_NULL STD { int linux_epoll_create1(void); }
-330 AUE_NULL STD { int linux_dup3(void); }
+330 AUE_NULL STD { int linux_dup3(l_int oldfd, \
+ l_int newfd, l_int flags); }
331 AUE_NULL STD { int linux_pipe2(l_int *pipefds, l_int flags); }
332 AUE_NULL STD { int linux_inotify_init1(void); }
; linux 2.6.30:
Modified: user/dchagin/lemul/sys/compat/linux/linux_file.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_file.c Tue Feb 26 17:49:06 2013 (r247325)
+++ user/dchagin/lemul/sys/compat/linux/linux_file.c Tue Feb 26 18:07:29 2013 (r247326)
@@ -1618,3 +1618,22 @@ linux_pipe2(struct thread *td, struct li
/* XXX: Close descriptors on error. */
return (copyout(fildes, args->pipefds, sizeof(fildes)));
}
+
+int
+linux_dup3(struct thread *td, struct linux_dup3_args *args)
+{
+ int cmd;
+ intptr_t newfd;
+
+ if (args->oldfd == args->newfd)
+ return (EINVAL);
+ if ((args->flags & ~LINUX_O_CLOEXEC) != 0)
+ return (EINVAL);
+ if (args->flags & LINUX_O_CLOEXEC)
+ cmd = F_DUP2FD_CLOEXEC;
+ else
+ cmd = F_DUP2FD;
+
+ newfd = args->newfd;
+ return (kern_fcntl(td, args->oldfd, cmd, newfd));
+}
Modified: user/dchagin/lemul/sys/i386/linux/linux_dummy.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_dummy.c Tue Feb 26 17:49:06 2013 (r247325)
+++ user/dchagin/lemul/sys/i386/linux/linux_dummy.c Tue Feb 26 18:07:29 2013 (r247326)
@@ -119,7 +119,6 @@ DUMMY(timerfd_gettime);
DUMMY(signalfd4);
DUMMY(eventfd2);
DUMMY(epoll_create1);
-DUMMY(dup3);
DUMMY(inotify_init1);
/* linux 2.6.30: */
DUMMY(preadv);
Modified: user/dchagin/lemul/sys/i386/linux/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/syscalls.master Tue Feb 26 17:49:06 2013 (r247325)
+++ user/dchagin/lemul/sys/i386/linux/syscalls.master Tue Feb 26 18:07:29 2013 (r247326)
@@ -546,7 +546,8 @@
327 AUE_NULL STD { int linux_signalfd4(void); }
328 AUE_NULL STD { int linux_eventfd2(void); }
329 AUE_NULL STD { int linux_epoll_create1(void); }
-330 AUE_NULL STD { int linux_dup3(void); }
+330 AUE_NULL STD { int linux_dup3(l_int oldfd, \
+ l_int newfd, l_int flags); }
331 AUE_NULL STD { int linux_pipe2(l_int *pipefds, l_int flags); }
332 AUE_NULL STD { int linux_inotify_init1(void); }
; linux 2.6.30:
More information about the svn-src-user
mailing list