[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 036/108] linux-user: Split out symlink, symlinkat
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 036/108] linux-user: Split out symlink, symlinkat |
Date: |
Sat, 9 Jun 2018 17:01:08 -1000 |
All targets define symlinkat; remove the ifdef.
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall.c | 64 +++++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 30 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 326323e377..39d8a70d7d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9331,6 +9331,36 @@ IMPL(stime)
}
#endif
+#ifdef TARGET_NR_symlink
+IMPL(symlink)
+{
+ char *p1 = lock_user_string(arg1);
+ char *p2 = lock_user_string(arg2);
+ abi_long ret = -TARGET_EFAULT;
+
+ if (p1 && p2) {
+ ret = get_errno(symlink(p1, p2));
+ }
+ unlock_user(p2, arg2, 0);
+ unlock_user(p1, arg1, 0);
+ return ret;
+}
+#endif
+
+IMPL(symlinkat)
+{
+ char *p1 = lock_user_string(arg1);
+ char *p2 = lock_user_string(arg3);
+ abi_long ret = -TARGET_EFAULT;
+
+ if (p1 && p2) {
+ ret = get_errno(symlinkat(p1, arg2, p2));
+ }
+ unlock_user(p2, arg3, 0);
+ unlock_user(p1, arg1, 0);
+ return ret;
+}
+
IMPL(sync)
{
sync();
@@ -9561,36 +9591,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned num,
abi_long arg1,
void *p;
switch(num) {
-#ifdef TARGET_NR_symlink
- case TARGET_NR_symlink:
- {
- void *p2;
- p = lock_user_string(arg1);
- p2 = lock_user_string(arg2);
- if (!p || !p2)
- ret = -TARGET_EFAULT;
- else
- ret = get_errno(symlink(p, p2));
- unlock_user(p2, arg2, 0);
- unlock_user(p, arg1, 0);
- }
- return ret;
-#endif
-#if defined(TARGET_NR_symlinkat)
- case TARGET_NR_symlinkat:
- {
- void *p2;
- p = lock_user_string(arg1);
- p2 = lock_user_string(arg3);
- if (!p || !p2)
- ret = -TARGET_EFAULT;
- else
- ret = get_errno(symlinkat(p, arg2, p2));
- unlock_user(p2, arg3, 0);
- unlock_user(p, arg1, 0);
- }
- return ret;
-#endif
#ifdef TARGET_NR_readlink
case TARGET_NR_readlink:
{
@@ -12837,6 +12837,10 @@ static impl_fn *syscall_table(unsigned num)
#ifdef TARGET_NR_stime
SYSCALL(stime);
#endif
+#ifdef TARGET_NR_symlink
+ SYSCALL(symlink);
+#endif
+ SYSCALL(symlinkat);
SYSCALL(sync);
#ifdef CONFIG_SYNCFS
SYSCALL(syncfs);
--
2.17.1
- [Qemu-devel] [PATCH v2 024/108] linux-user: Split out dup, mkdir, mkdirat, rmdir, (continued)
- [Qemu-devel] [PATCH v2 024/108] linux-user: Split out dup, mkdir, mkdirat, rmdir, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 025/108] linux-user: Split out acct, pipe, pipe2, times, umount2, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 027/108] linux-user: Split out chroot, dup2, dup3, fcntl, setpgid, umask, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 026/108] linux-user: Split out ioctl, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 028/108] linux-user: Split out getpgrp, getppid, setsid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 029/108] linux-user: Split out rt_sigaction, sigaction, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 030/108] linux-user: Split out rt_sigprocmask, sgetmask, sigprocmask, ssetmask, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 031/108] linux-user: Split out rt_sigpending, rt_sigsuspend, sigpending, sigsuspend, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 032/108] linux-user: Split out rt_sigqueueinfo, rt_sigtimedwait, rt_tgsigqueueinfo, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 033/108] linux-user: Split out rt_sigreturn, sethostname, setrlimit, sigreturn, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 036/108] linux-user: Split out symlink, symlinkat,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 037/108] linux-user: Split out readlink, readlinkat, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 038/108] linux-user: Split out mmap, mmap2, reboot, swapon, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 039/108] linux-user: Split out mprotect, mremap, msync, munmap, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 040/108] linux-user: Split out mlock, mlockall, munlock, munlockall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 041/108] linux-user: Split out fchmod, fchmodat, ftruncate, truncate, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 042/108] linux-user: Split out fstatfs, fstatfs64, statfs, statfs64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 043/108] linux-user: Split out getpriority, setpriority, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 044/108] linux-user: Split out socketcall, Richard Henderson, 2018/06/09
- Prev by Date:
[Qemu-devel] [PATCH v2 033/108] linux-user: Split out rt_sigreturn, sethostname, setrlimit, sigreturn
- Next by Date:
[Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect
- Previous by thread:
[Qemu-devel] [PATCH v2 033/108] linux-user: Split out rt_sigreturn, sethostname, setrlimit, sigreturn
- Next by thread:
[Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect
- Index(es):