From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: jrtc27@FreeBSD.org, Warner Losh <imp@bsdimp.com>,
def@FreeBSD.org, arrowd@freebsd.org,
Kyle Evans <kevans@freebsd.org>,
Richard Henderson <richard.henderson@linaro.org>,
Stacey Son <sson@FreeBSD.org>, Jung-uk Kim <jkim@FreeBSD.org>
Subject: [PATCH 08/11] bsd-user: Implement rmdir and undocumented -_getcwd
Date: Sun, 12 Jun 2022 14:48:48 -0600 [thread overview]
Message-ID: <20220612204851.19914-9-imp@bsdimp.com> (raw)
In-Reply-To: <20220612204851.19914-1-imp@bsdimp.com>
Implemenet rmdir and __getcwd. Declare __getcwd as extern because
there's no installed FreeBSD header that has it. It's used internally by
libc, which doesn't provide an external declaration, but does export the
symbol.
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>
---
bsd-user/bsd-file.h | 30 ++++++++++++++++++++++++++++++
bsd-user/freebsd/os-syscall.c | 8 ++++++++
2 files changed, 38 insertions(+)
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
index 35036364ad8..500d6ba78b9 100644
--- a/bsd-user/bsd-file.h
+++ b/bsd-user/bsd-file.h
@@ -55,6 +55,7 @@ extern struct iovec *lock_iovec(int type, abi_ulong target_addr, int count,
int copy);
extern void unlock_iovec(struct iovec *vec, abi_ulong target_addr, int count,
int copy);
+extern int __getcwd(char *path, size_t len);
int safe_open(const char *path, int flags, mode_t mode);
int safe_openat(int fd, const char *path, int flags, mode_t mode);
@@ -461,4 +462,33 @@ static abi_long do_bsd_mkdirat(abi_long arg1, abi_long arg2,
return ret;
}
+/* rmdir(2) */
+static abi_long do_bsd_rmdir(abi_long arg1)
+{
+ abi_long ret;
+ void *p;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(rmdir(p)); /* XXX path(p)? */
+ UNLOCK_PATH(p, arg1);
+
+ return ret;
+}
+
+/* undocumented __getcwd(char *buf, size_t len) system call */
+static abi_long do_bsd___getcwd(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+
+ p = lock_user(VERIFY_WRITE, arg1, arg2, 0);
+ if (p == NULL) {
+ return -TARGET_EFAULT;
+ }
+ ret = __getcwd(p, arg2);
+ unlock_user(p, arg1, ret == 0 ? strlen(p) + 1 : 0);
+
+ return get_errno(ret);
+}
+
#endif /* BSD_FILE_H */
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 9381ddb5be1..e28a566d6c3 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -341,6 +341,14 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_bsd_mkdirat(arg1, arg2, arg3);
break;
+ case TARGET_FREEBSD_NR_rmdir: /* rmdir(2) (XXX no rmdirat()?) */
+ ret = do_bsd_rmdir(arg1);
+ break;
+
+ case TARGET_FREEBSD_NR___getcwd: /* undocumented __getcwd() */
+ ret = do_bsd___getcwd(arg1, arg2);
+ break;
+
default:
qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
ret = -TARGET_ENOSYS;
--
2.33.1
next prev parent reply other threads:[~2022-06-12 20:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-12 20:48 [PATCH 00/11] bsd-user: Next round of syscalls Warner Losh
2022-06-12 20:48 ` [PATCH 01/11] bsd-user: Implement open, openat and close Warner Losh
2022-06-13 19:45 ` Richard Henderson
2022-06-12 20:48 ` [PATCH 02/11] bsd-user: Implement fdatasync, fsync and close_from Warner Losh
2022-06-13 19:46 ` Richard Henderson
2022-06-12 20:48 ` [PATCH 03/11] bsd-user: Implement revoke, access, eaccess and faccessat Warner Losh
2022-06-13 19:47 ` Richard Henderson
2022-06-13 23:07 ` Philippe Mathieu-Daudé via
2022-06-12 20:48 ` [PATCH 04/11] bsd-user: Implement chdir and fchdir Warner Losh
2022-06-13 19:48 ` Richard Henderson
2022-06-12 20:48 ` [PATCH 05/11] bsd-user: Implement rename and renameat Warner Losh
2022-06-13 19:49 ` Richard Henderson
2022-06-12 20:48 ` [PATCH 06/11] bsd-user: Implement link, linkat, unlink and unlinkat Warner Losh
2022-06-13 19:49 ` Richard Henderson
2022-06-12 20:48 ` [PATCH 07/11] bsd-user: Implement mkdir and mkdirat Warner Losh
2022-06-13 19:50 ` Richard Henderson
2022-06-12 20:48 ` Warner Losh [this message]
2022-06-13 19:52 ` [PATCH 08/11] bsd-user: Implement rmdir and undocumented -_getcwd Richard Henderson
2022-06-13 23:45 ` Warner Losh
2022-06-12 20:48 ` [PATCH 09/11] bsd-user: Implement dup and dup2 Warner Losh
2022-06-13 19:53 ` Richard Henderson
2022-06-13 21:54 ` Warner Losh
2022-06-12 20:48 ` [PATCH 10/11] bsd-user: Implement trunctate and ftruncate Warner Losh
2022-06-13 19:54 ` Richard Henderson
2022-06-12 20:48 ` [PATCH 11/11] bsd-user: Implement acct and sync Warner Losh
2022-06-13 19:54 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220612204851.19914-9-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=arrowd@freebsd.org \
--cc=def@FreeBSD.org \
--cc=jkim@FreeBSD.org \
--cc=jrtc27@FreeBSD.org \
--cc=kevans@freebsd.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sson@FreeBSD.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).