summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2022-09-04 21:25:19 +0200
committerJo-Philipp Wich <jo@mein.io>2022-09-05 09:07:32 +0200
commit0ba9c3e8406678516ffaa9f3ccfcaccae15cc80f (patch)
tree8b3c99c393c7139b2f8713b068b14389dc2e1e5c /lib
parent344fa9e69da43ecdc4d8f7768d85d42639352405 (diff)
fs: add optional third permission argument to fs.open()
Rework the `fs.open()` implementation to accept an optional third file permission argument which is applied to newly created files. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'lib')
-rw-r--r--lib/fs.c63
1 files changed, 59 insertions, 4 deletions
diff --git a/lib/fs.c b/lib/fs.c
index b831aee..e0e5179 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -26,6 +26,7 @@
#include <glob.h>
#include <fnmatch.h>
#include <limits.h>
+#include <fcntl.h>
#ifndef __APPLE__
#include <sys/sysmacros.h> /* major(), minor() */
@@ -370,18 +371,72 @@ uc_fs_fileno(uc_vm_t *vm, size_t nargs)
static uc_value_t *
uc_fs_open(uc_vm_t *vm, size_t nargs)
{
+ int open_mode, open_flags, fd, i;
uc_value_t *path = uc_fn_arg(0);
uc_value_t *mode = uc_fn_arg(1);
+ uc_value_t *perm = uc_fn_arg(2);
+ mode_t open_perm = 0666;
FILE *fp;
+ char *m;
if (ucv_type(path) != UC_STRING)
err_return(EINVAL);
- fp = fopen(ucv_string_get(path),
- ucv_type(mode) == UC_STRING ? ucv_string_get(mode) : "r");
+ m = (ucv_type(mode) == UC_STRING) ? ucv_string_get(mode) : "r";
- if (!fp)
- err_return(errno);
+ switch (*m) {
+ case 'r':
+ open_mode = O_RDONLY;
+ open_flags = 0;
+ break;
+
+ case 'w':
+ open_mode = O_WRONLY;
+ open_flags = O_CREAT | O_TRUNC;
+ break;
+
+ case 'a':
+ open_mode = O_WRONLY;
+ open_flags = O_CREAT | O_APPEND;
+ break;
+
+ default:
+ err_return(EINVAL);
+ }
+
+ for (i = 1; m[i]; i++) {
+ switch (m[i]) {
+ case '+': open_mode = O_RDWR; break;
+ case 'x': open_flags |= O_EXCL; break;
+ case 'e': open_flags |= O_CLOEXEC; break;
+ }
+ }
+
+ if (perm) {
+ if (ucv_type(perm) != UC_INTEGER)
+ err_return(EINVAL);
+
+ open_perm = ucv_int64_get(perm);
+ }
+
+#ifdef O_LARGEFILE
+ open_flags |= open_mode | O_LARGEFILE;
+#else
+ open_flags |= open_mode;
+#endif
+
+ fd = open(ucv_string_get(path), open_flags, open_perm);
+
+ if (fd < 0)
+ return NULL;
+
+ fp = fdopen(fd, m);
+
+ if (!fp) {
+ i = errno;
+ close(fd);
+ err_return(i);
+ }
return uc_resource_new(file_type, fp);
}