andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added chdir() and getcwd(). 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15381 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-01-21 09:20:28 +00:00
parent f0a0fea78e
commit 3ee7d28428
7 changed files with 89 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/sb/apps/msh/source/paths.c
View File

@ -164,6 +164,7 @@ size_t path_add_separator(char *dst, size_t size) {
return dn + 1; return dn + 1;
} }
#if 0
/** /**
* @brief Normalizes an absolute path. * @brief Normalizes an absolute path.
* @note The destination buffer can be the same of the source buffer. * @note The destination buffer can be the same of the source buffer.
@ -242,5 +243,6 @@ size_t path_normalize(char *dst, const char *src, size_t size) {
n++; n++;
} }
} }
#endif
/** @} */ /** @} */

12
os/sb/common/sbsysc.h
View File

@ -58,11 +58,13 @@
#define SB_POSIX_CLOSE 2 #define SB_POSIX_CLOSE 2
#define SB_POSIX_DUP 3 #define SB_POSIX_DUP 3
#define SB_POSIX_DUP2 4 #define SB_POSIX_DUP2 4
#define SB_POSIX_FSTAT 9 #define SB_POSIX_FSTAT 5
#define SB_POSIX_READ 5 #define SB_POSIX_READ 6
#define SB_POSIX_WRITE 6 #define SB_POSIX_WRITE 7
#define SB_POSIX_LSEEK 7 #define SB_POSIX_LSEEK 8
#define SB_POSIX_GETDENTS 8 #define SB_POSIX_GETDENTS 9
#define SB_POSIX_CHDIR 10
#define SB_POSIX_GETCWD 11
/** @} */ /** @} */
/*===========================================================================*/ /*===========================================================================*/

49
os/sb/host/sbapi.c
View File

@ -980,45 +980,52 @@ void sb_api_stdio(struct port_extctx *ectxp) {
switch (ectxp->r0) { switch (ectxp->r0) {
case SB_POSIX_OPEN: case SB_POSIX_OPEN:
ectxp->r0 = sb_posix_open((const char *)ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_open((const char *)ectxp->r1,
ectxp->r2); (int)ectxp->r2);
break; break;
case SB_POSIX_CLOSE: case SB_POSIX_CLOSE:
ectxp->r0 = sb_posix_close(ectxp->r1); ectxp->r0 = (uint32_t)sb_posix_close((int)ectxp->r1);
break; break;
case SB_POSIX_DUP: case SB_POSIX_DUP:
ectxp->r0 = sb_posix_dup((int)ectxp->r1); ectxp->r0 = (uint32_t)sb_posix_dup((int)ectxp->r1);
break; break;
case SB_POSIX_DUP2: case SB_POSIX_DUP2:
ectxp->r0 = sb_posix_dup2((int)ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_dup2((int)ectxp->r1,
(int)ectxp->r2); (int)ectxp->r2);
break; break;
case SB_POSIX_FSTAT: case SB_POSIX_FSTAT:
ectxp->r0 = sb_posix_fstat((int)ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_fstat((int)ectxp->r1,
(struct stat *)ectxp->r2); (struct stat *)ectxp->r2);
break; break;
case SB_POSIX_READ: case SB_POSIX_READ:
ectxp->r0 = sb_posix_read(ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_read((int)ectxp->r1,
(void *)ectxp->r2, (void *)ectxp->r2,
(size_t)ectxp->r3); (size_t)ectxp->r3);
break; break;
case SB_POSIX_WRITE: case SB_POSIX_WRITE:
ectxp->r0 = sb_posix_write(ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_write((int)ectxp->r1,
(const void *)ectxp->r2, (const void *)ectxp->r2,
(size_t)ectxp->r3); (size_t)ectxp->r3);
break; break;
case SB_POSIX_LSEEK: case SB_POSIX_LSEEK:
ectxp->r0 = sb_posix_lseek(ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_lseek((int)ectxp->r1,
ectxp->r2, (off_t)ectxp->r2,
ectxp->r3); (int)ectxp->r3);
break; break;
case SB_POSIX_GETDENTS: case SB_POSIX_GETDENTS:
ectxp->r0 = sb_posix_getdents(ectxp->r1, ectxp->r0 = (uint32_t)sb_posix_getdents((int)ectxp->r1,
(void *)ectxp->r2, (void *)ectxp->r2,
(size_t)ectxp->r3); (size_t)ectxp->r3);
break;
case SB_POSIX_CHDIR:
ectxp->r0 = (uint32_t)sb_posix_chdir((const char *)ectxp->r1);
break;
case SB_POSIX_GETCWD:
ectxp->r0 = (uint32_t)sb_posix_getcwd((char *)ectxp->r1,
(size_t)ectxp->r2);
break; break;
default: default:
ectxp->r0 = CH_RET_ENOSYS; ectxp->r0 = (uint32_t)CH_RET_ENOSYS;
break; break;
} }
} }

22
os/sb/host/sbposix.c
View File

@ -300,6 +300,28 @@ ssize_t sb_posix_getdents(int fd, void *buf, size_t count) {
return (ssize_t)ret; return (ssize_t)ret;
} }
int sb_posix_chdir(const char *path) {
sb_class_t *sbp = (sb_class_t *)chThdGetSelfX()->ctx.syscall.p;
if (sb_check_string(sbp, (void *)path, VFS_CFG_PATHLEN_MAX + 1) == (size_t)0) {
return CH_RET_EFAULT;
}
return (int)vfsDrvChangeCurrentDirectory(sbp->config->vfs_driver, path);
}
int sb_posix_getcwd(char *buf, size_t size) {
sb_class_t *sbp = (sb_class_t *)chThdGetSelfX()->ctx.syscall.p;
if (!sb_is_valid_write_range(sbp, buf, size)) {
return CH_RET_EFAULT;
}
/* Note, it does not return a pointer to the buffer as required by Posix,
this has to be handled on the user-side library.*/
return vfsDrvGetCurrentDirectory(sbp->config->vfs_driver, buf, size);
}
#else /* Fallbacks for when there is no VFS.*/ #else /* Fallbacks for when there is no VFS.*/
uint32_t sb_posix_open(const char *pathname, uint32_t flags) { uint32_t sb_posix_open(const char *pathname, uint32_t flags) {

2
os/sb/host/sbposix.h
View File

@ -68,6 +68,8 @@ extern "C" {
ssize_t sb_posix_write(int fd, const void *buf, size_t count); ssize_t sb_posix_write(int fd, const void *buf, size_t count);
off_t sb_posix_lseek(int fd, off_t offset, int whence); off_t sb_posix_lseek(int fd, off_t offset, int whence);
ssize_t sb_posix_getdents(int fd, void *buf, size_t count); ssize_t sb_posix_getdents(int fd, void *buf, size_t count);
int sb_posix_chdir(const char *path);
int sb_posix_getcwd(char *buf, size_t size);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
os/sb/user/lib/syscalls.c
View File

@ -148,7 +148,7 @@ __attribute__((used))
int _getdents_r(struct _reent *r, int fd, void *dp, int count) { int _getdents_r(struct _reent *r, int fd, void *dp, int count) {
ssize_t n; ssize_t n;
n = sbPosixGetdents(fd, dp, count); n = sbGetdents(fd, dp, count);
if (CH_RET_IS_ERROR(n)) { if (CH_RET_IS_ERROR(n)) {
__errno_r(r) = CH_DECODE_ERROR(n); __errno_r(r) = CH_DECODE_ERROR(n);
return -1; return -1;

30
os/sb/user/sbuser.h
View File

@ -216,8 +216,7 @@ extern "C" {
* @param[in] flags open mode * @param[in] flags open mode
* @return The file descriptor or an error. * @return The file descriptor or an error.
*/ */
static inline int sbOpen(const char *pathname, static inline int sbOpen(const char *pathname, int flags) {
int flags) {
__syscall3r(0, SB_POSIX_OPEN, pathname, flags); __syscall3r(0, SB_POSIX_OPEN, pathname, flags);
return (int)r0; return (int)r0;
@ -323,12 +322,37 @@ static inline off_t sbSeek(int fd, off_t offset, int whence) {
* @param[in] count number of bytes * @param[in] count number of bytes
* @return The number of bytes really transferred or an error. * @return The number of bytes really transferred or an error.
*/ */
static inline ssize_t sbPosixGetdents(int fd, void *buf, size_t count) { static inline ssize_t sbGetdents(int fd, void *buf, size_t count) {
__syscall4r(0, SB_POSIX_GETDENTS, fd, buf, count); __syscall4r(0, SB_POSIX_GETDENTS, fd, buf, count);
return (ssize_t)r0; return (ssize_t)r0;
} }
/**
* @brief Posix-style change current directory.
*
* @param[in] path new current path
* @return Operation result.
*/
static inline int sbChdir(const char *path) {
__syscall2r(0, SB_POSIX_CHDIR, path);
return (int)r0;
}
/**
* @brief Posix-style get current directory.
*
* @param[in] buf path buffer
* @param[in] size path buffer size
* @return Operation result.
*/
static inline int sbGetcwd(char *buf, size_t size) {
__syscall3r(0, SB_POSIX_GETCWD, buf, size);
return (int)r0;
}
/** /**
* @brief Terminates the sandbox. * @brief Terminates the sandbox.
* *