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

file: add append write support

Browse source 
Signed-off-by: Luka Perkov <luka@openwrt.org>
This commit is contained in:
Luka Perkov 2016-04-11 18:56:51 +02:00 committed by Jo-Philipp Wich
parent e64cbdd9b4
commit c8c8f7d014
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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_APPEND,
RPC_F_RW_MODE, RPC_F_RW_MODE,
RPC_F_RW_BASE64, RPC_F_RW_BASE64,
__RPC_F_RW_MAX, __RPC_F_RW_MAX,
@ -101,6 +102,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_APPEND] = { .name = "append", .type = BLOBMSG_TYPE_BOOL },
[RPC_F_RW_MODE] = { .name = "mode", .type = BLOBMSG_TYPE_INT32 }, [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 },
}; };
@ -265,6 +267,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];
int append = O_TRUNC;
mode_t prev_mode, mode = 0666; mode_t prev_mode, mode = 0666;
int fd, rv = 0; int fd, rv = 0;
void *data = NULL; void *data = NULL;
@ -279,11 +282,14 @@ 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 (tb[RPC_F_RW_APPEND] && blobmsg_get_bool(tb[RPC_F_RW_APPEND]))
append = O_APPEND;
if (tb[RPC_F_RW_MODE]) if (tb[RPC_F_RW_MODE])
mode = blobmsg_get_u32(tb[RPC_F_RW_MODE]); mode = blobmsg_get_u32(tb[RPC_F_RW_MODE]);
prev_mode = umask(0); prev_mode = umask(0);
fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | O_TRUNC, mode); fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | append, mode);
umask(prev_mode); umask(prev_mode);
if (fd < 0) if (fd < 0)
return rpc_errno_status(); return rpc_errno_status();