X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=file.c;h=f9c65a20da6d03397d3900322377f6d8886ce834;hp=4a8a5c8064d1fee950d1d20d4e4fcf16c8540e1d;hb=835b8b768da374075af56f624537d03d8ec97647;hpb=e0afdb10ae879d26d7f81d1dba8d47978a9a2aa9

diff --git a/file.c b/file.c
index 4a8a5c8..f9c65a2 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /*
  * rpcd - UBUS RPC server
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -87,7 +87,7 @@ enum {
 };
 
 static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = {
-	[RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING },
+	[RPC_E_CMD]  = { .name = "command", .type = BLOBMSG_TYPE_STRING },
 	[RPC_E_PARM] = { .name = "params",  .type = BLOBMSG_TYPE_ARRAY  },
 	[RPC_E_ENV]  = { .name = "env",     .type = BLOBMSG_TYPE_TABLE  },
 };
@@ -203,21 +203,25 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
 	int fd;
-	char *path;
-	struct stat s;
-	struct blob_attr **tb;
+	struct blob_attr *tb[__RPC_F_MAX];
 
-	if (!(tb = rpc_check_path(msg, &path, &s)))
-		return rpc_errno_status();
+	blobmsg_parse(rpc_file_policy, __RPC_F_MAX, tb,
+	              blob_data(msg), blob_len(msg));
 
-	if (!tb[RPC_F_DATA])
+	if (!tb[RPC_F_PATH] || !tb[RPC_F_DATA])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	if ((fd = open(path, O_WRONLY)) < 0)
+	if ((fd = open(blobmsg_data(tb[RPC_F_PATH]), O_CREAT | O_TRUNC | O_WRONLY)) < 0)
+		return rpc_errno_status();
+
+	if (write(fd, blobmsg_data(tb[RPC_F_DATA]), blobmsg_data_len(tb[RPC_F_DATA])) < 0)
+		return rpc_errno_status();
+
+	if (fsync(fd) < 0)
 		return rpc_errno_status();
 
-	write(fd, blobmsg_data(tb[RPC_F_DATA]), blobmsg_data_len(tb[RPC_F_DATA]));
 	close(fd);
+	sync();
 
 	return 0;
 }
@@ -457,7 +461,7 @@ rpc_file_exec_epipe_state_cb(struct ustream *s)
 
 static int
 rpc_file_exec_run(const char *cmd,
-			      const struct blob_attr *arg, const struct blob_attr *env,
+                  const struct blob_attr *arg, const struct blob_attr *env,
                   struct ubus_context *ctx, struct ubus_request_data *req)
 {
 	pid_t pid;
@@ -580,7 +584,7 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	return rpc_file_exec_run(blobmsg_data(tb[RPC_E_CMD]),
-					         tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
+					      tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
 }