diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2017-11-30 17:41:28 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2017-12-06 18:44:23 +0100 |
| commit | cfe1e75c91bc1bac82e6caab3e652b0ebee59524 (patch) | |
| tree | 15adbad7dacd9e53f1798e36a81138e3ed638fdc | |
| parent | 74a784f037867025ad1c6b8c38bfdfa548742339 (diff) | |
| download | rpcd-cfe1e75c91bc1bac82e6caab3e652b0ebee59524.tar.gz | |
sys: packagelist: allow listing all packages
Introduce optional boolean attribute 'all' to allow listing all
installed packages instead of only the user-selected ones.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | sys.c | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -45,6 +45,15 @@ static const struct blobmsg_policy rpc_upgrade_policy[__RPC_UPGRADE_MAX] = { [RPC_UPGRADE_KEEP] = { .name = "keep", .type = BLOBMSG_TYPE_BOOL }, }; +enum { + RPC_PACKAGELIST_ALL, + __RPC_PACKAGELIST_MAX +}; + +static const struct blobmsg_policy rpc_packagelist_policy[__RPC_PACKAGELIST_MAX] = { + [RPC_PACKAGELIST_ALL] = { .name = "all", .type = BLOBMSG_TYPE_BOOL }, +}; + static int rpc_errno_status(void) { @@ -159,11 +168,19 @@ rpc_sys_packagelist(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { + struct blob_attr *tb[__RPC_PACKAGELIST_MAX]; + int all = false; struct blob_buf buf = { 0 }; char var[256], pkg[128], ver[128]; char *tmp, *p1, *p2, *p3; void *tbl; + blobmsg_parse(rpc_packagelist_policy, __RPC_PACKAGELIST_MAX, tb, + blob_data(msg), blob_len(msg)); + + if (tb[RPC_PACKAGELIST_ALL] && blobmsg_get_bool(tb[RPC_PACKAGELIST_ALL])) + all = true; + FILE *f = fopen("/usr/lib/opkg/status", "r"); if (!f) return UBUS_STATUS_NOT_FOUND; @@ -218,7 +235,7 @@ procstr: if (p2 && p3 && !strcmp(var, "Status:") && !strcmp(p1, "install") && - !strcmp(p2, "user") && + (all || strstr(p2, "user")) && !strcmp(p3, "installed") && pkg[0] && ver[0]) { blobmsg_add_string(&buf, pkg, ver); pkg[0] = ver[0] = '\0'; @@ -314,7 +331,7 @@ static int rpc_sys_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) { static const struct ubus_method sys_methods[] = { - UBUS_METHOD_NOARG("packagelist", rpc_sys_packagelist), + UBUS_METHOD("packagelist", rpc_sys_packagelist, rpc_packagelist_policy), UBUS_METHOD("password_set", rpc_cgi_password_set, rpc_password_policy), UBUS_METHOD_NOARG("upgrade_test", rpc_sys_upgrade_test), UBUS_METHOD("upgrade_start", rpc_sys_upgrade_start, |