From: John Crispin <blogic@openwrt.org>
Date: Mon, 16 Jun 2014 15:52:18 +0000 (+0100)
Subject: rename the folder option to path
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=9c9c71a4e476be1e93f4d4c2c0527b5df0ff3c90;p=project%2Fprocd.git

rename the folder option to path

Signed-off-by: John Crispin <blogic@openwrt.org>
---

diff --git a/system.c b/system.c
index 29ca656..2dbed51 100644
--- a/system.c
+++ b/system.c
@@ -287,21 +287,21 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 enum {
-	NAND_FOLDER,
+	NAND_PATH,
 	__NAND_MAX
 };
 
 static const struct blobmsg_policy nand_policy[__NAND_MAX] = {
-	[NAND_FOLDER] = { .name = "folder", .type = BLOBMSG_TYPE_STRING },
+	[NAND_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
 };
 
 static void
-procd_spawn_upgraded(char *folder)
+procd_spawn_upgraded(char *path)
 {
 	char *wdt_fd = watchdog_fd();
 	char *argv[] = { "/tmp/upgraded", NULL, NULL};
 
-	argv[1] = folder;
+	argv[1] = path;
 
 	DEBUG(2, "Exec to upgraded now\n");
 	if (wdt_fd) {
@@ -321,10 +321,10 @@ static int nand_set(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	blobmsg_parse(nand_policy, __NAND_MAX, tb, blob_data(msg), blob_len(msg));
-	if (!tb[NAND_FOLDER])
+	if (!tb[NAND_PATH])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	procd_spawn_upgraded(blobmsg_get_string(tb[NAND_FOLDER]));
+	procd_spawn_upgraded(blobmsg_get_string(tb[NAND_PATH]));
 	fprintf(stderr, "Yikees, something went wrong. no /sbin/upgraded ?\n");
 	return 0;
 }