Signed-off-by: Luka Perkov <l...@openwrt.org>
---
=> changes in v2:
Return umask() to previous value after temporary changing it.
file.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/file.c b/file.c
index d39dccb..fe1bc39 100644
--- a/file.c
+++ b/file.c
@@ -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]))
--
2.4.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
