DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file: add support for setting mode when writing files

Browse source 
Signed-off-by: Luka Perkov <luka@openwrt.org>
This commit is contained in:
Luka Perkov 2015-05-11 23:28:18 +02:00 committed by Jo-Philipp Wich
parent fc895bb1e2
commit 4db5df8a96
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
file.c
View file

@ -93,6 +93,7 @@ static const struct blobmsg_policy rpc_file_rb_policy[__RPC_F_RB_MAX] = {
enum { enum {
RPC_F_RW_PATH, RPC_F_RW_PATH,
RPC_F_RW_DATA, RPC_F_RW_DATA,
RPC_F_RW_MODE,
RPC_F_RW_BASE64, RPC_F_RW_BASE64,
__RPC_F_RW_MAX, __RPC_F_RW_MAX,
}; };
@ -100,6 +101,7 @@ enum {
static const struct blobmsg_policy rpc_file_rw_policy[__RPC_F_RW_MAX] = { 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_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
[RPC_F_RW_DATA] = { .name = "data", .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 }, [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 *msg)
{ {
struct blob_attr *tb[__RPC_F_RW_MAX]; struct blob_attr *tb[__RPC_F_RW_MAX];
mode_t prev_mode, mode = 0666;
int fd, rv = 0; int fd, rv = 0;
void *data = NULL; void *data = NULL;
size_t data_len = 0; 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 = blobmsg_data(tb[RPC_F_RW_DATA]);
data_len = blobmsg_data_len(tb[RPC_F_RW_DATA]) - 1; 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(); return rpc_errno_status();
if (tb[RPC_F_RW_BASE64] && blobmsg_get_bool(tb[RPC_F_RW_BASE64])) if (tb[RPC_F_RW_BASE64] && blobmsg_get_bool(tb[RPC_F_RW_BASE64]))