[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/11] bsd-user: Implement rename and renameat
From: |
Warner Losh |
Subject: |
[PULL 05/11] bsd-user: Implement rename and renameat |
Date: |
Sun, 19 Jun 2022 12:05:25 -0600 |
Plus the helper LOCK_PATH2 and UNLOCK_PATH2 macros.
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/bsd-file.h | 45 +++++++++++++++++++++++++++++++++++
bsd-user/freebsd/os-syscall.c | 8 +++++++
2 files changed, 53 insertions(+)
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
index bc0a0c08d55..fd8aba96180 100644
--- a/bsd-user/bsd-file.h
+++ b/bsd-user/bsd-file.h
@@ -32,6 +32,24 @@ do { \
#define UNLOCK_PATH(p, arg) unlock_user(p, arg, 0)
+#define LOCK_PATH2(p1, arg1, p2, arg2) \
+do { \
+ (p1) = lock_user_string(arg1); \
+ if ((p1) == NULL) { \
+ return -TARGET_EFAULT; \
+ } \
+ (p2) = lock_user_string(arg2); \
+ if ((p2) == NULL) { \
+ unlock_user(p1, arg1, 0); \
+ return -TARGET_EFAULT; \
+ } \
+} while (0)
+
+#define UNLOCK_PATH2(p1, arg1, p2, arg2) \
+do { \
+ unlock_user(p2, arg2, 0); \
+ unlock_user(p1, arg1, 0); \
+} while (0)
extern struct iovec *lock_iovec(int type, abi_ulong target_addr, int count,
int copy);
@@ -330,4 +348,31 @@ static abi_long do_bsd_fchdir(abi_long arg1)
return get_errno(fchdir(arg1));
}
+/* rename(2) */
+static abi_long do_bsd_rename(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p1, *p2;
+
+ LOCK_PATH2(p1, arg1, p2, arg2);
+ ret = get_errno(rename(p1, p2)); /* XXX path(p1), path(p2) */
+ UNLOCK_PATH2(p1, arg1, p2, arg2);
+
+ return ret;
+}
+
+/* renameat(2) */
+static abi_long do_bsd_renameat(abi_long arg1, abi_long arg2,
+ abi_long arg3, abi_long arg4)
+{
+ abi_long ret;
+ void *p1, *p2;
+
+ LOCK_PATH2(p1, arg2, p2, arg4);
+ ret = get_errno(renameat(arg1, p1, arg3, p2));
+ UNLOCK_PATH2(p1, arg2, p2, arg4);
+
+ return ret;
+}
+
#endif /* BSD_FILE_H */
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 8698db358c1..2d62a546328 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -309,6 +309,14 @@ static abi_long freebsd_syscall(void *cpu_env, int num,
abi_long arg1,
ret = do_bsd_fchdir(arg1);
break;
+ case TARGET_FREEBSD_NR_rename: /* rename(2) */
+ ret = do_bsd_rename(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_renameat: /* renameat(2) */
+ ret = do_bsd_renameat(arg1, arg2, arg3, arg4);
+ break;
+
default:
qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
ret = -TARGET_ENOSYS;
--
2.33.1
- [PULL 00/11] Bsd user syscall 2022q2 patches, Warner Losh, 2022/06/19
- [PULL 02/11] bsd-user: Implement fdatasync, fsync and close_from, Warner Losh, 2022/06/19
- [PULL 01/11] bsd-user: Implement open, openat and close, Warner Losh, 2022/06/19
- [PULL 04/11] bsd-user: Implement chdir and fchdir, Warner Losh, 2022/06/19
- [PULL 05/11] bsd-user: Implement rename and renameat,
Warner Losh <=
- [PULL 03/11] bsd-user: Implement revoke, access, eaccess and faccessat, Warner Losh, 2022/06/19
- [PULL 07/11] bsd-user: Implement mkdir and mkdirat, Warner Losh, 2022/06/19
- [PULL 09/11] bsd-user: Implement dup and dup2, Warner Losh, 2022/06/19
- [PULL 11/11] bsd-user: Implement acct and sync, Warner Losh, 2022/06/19
- [PULL 06/11] bsd-user: Implement link, linkat, unlink and unlinkat, Warner Losh, 2022/06/19
- [PULL 08/11] bsd-user: Implement rmdir and undocumented __getcwd, Warner Losh, 2022/06/19
- [PULL 10/11] bsd-user: Implement trunctate and ftruncate, Warner Losh, 2022/06/19
- Re: [PULL 00/11] Bsd user syscall 2022q2 patches, Richard Henderson, 2022/06/19