diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-05-11 23:28:18 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-07-15 00:21:28 +0200 |
| commit | 4db5df8a967193b35d9ab4dc3055660f58e0f950 (patch) | |
| tree | c2bf80de5f0afbfec64da2f3c2dd38ceb747ac42 | |
| parent | fc895bb1e213cca47bf9335615dcd1c2b778b5b6 (diff) | |
| download | rpcd-4db5df8a967193b35d9ab4dc3055660f58e0f950.tar.gz | |
file: add support for setting mode when writing files
Signed-off-by: Luka Perkov <luka@openwrt.org>
| -rw-r--r-- | file.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -93,6 +93,7 @@ static const struct blobmsg_policy rpc_file_rb_policy[__RPC_F_RB_MAX] = { enum { RPC_F_RW_PATH, RPC_F_RW_DATA, + RPC_F_RW_MODE, RPC_F_RW_BASE64, __RPC_F_RW_MAX, }; @@ -100,6 +101,7 @@ enum { static const struct blobmsg_policy rpc_file_rw_policy[__RPC_F_RW_MAX] = { [RPC_F_RW_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, [RPC_F_RW_DATA] = { .name = "data", .type = BLOBMSG_TYPE_STRING }, + [RPC_F_RW_MODE] = { .name = "mode", .type = BLOBMSG_TYPE_INT32 }, [RPC_F_RW_BASE64] = { .name = "base64", .type = BLOBMSG_TYPE_BOOL }, }; @@ -263,6 +265,7 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct blob_attr *tb[__RPC_F_RW_MAX]; + mode_t prev_mode, mode = 0666; int fd, rv = 0; void *data = NULL; size_t data_len = 0; @@ -276,7 +279,13 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj, data = blobmsg_data(tb[RPC_F_RW_DATA]); data_len = blobmsg_data_len(tb[RPC_F_RW_DATA]) - 1; - if ((fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_TRUNC | O_WRONLY, 0666)) < 0) + if (tb[RPC_F_RW_MODE]) + mode = blobmsg_get_u32(tb[RPC_F_RW_MODE]); + + prev_mode = umask(0); + fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | O_TRUNC, mode); + umask(prev_mode); + if (fd < 0) return rpc_errno_status(); if (tb[RPC_F_RW_BASE64] && blobmsg_get_bool(tb[RPC_F_RW_BASE64])) |