sys: packagelist: drop ABI version from package name

[project/rpcd.git] / sys.c

diff --git a/sys.c b/sys.c
index 4f008bab56a9477bb0e5edcdc81f95ce827e51bb..69daa1b02aeb343646202265bd0316abd70f010c 100644 (file)
--- a/sys.c
+++ b/sys.c
@@ -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)
 {
@@ -78,6 +87,8 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
        struct blob_attr *tb[__RPC_P_MAX];
        ssize_t n;
        int ret;
+       const char *const passwd = "/bin/passwd";
+       const struct timespec ts = {0, 100 * 1000 * 1000};
 
        blobmsg_parse(rpc_password_policy, __RPC_P_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -85,7 +96,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
        if (!tb[RPC_P_USER] || !tb[RPC_P_PASSWORD])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       if (stat("/usr/bin/passwd", &s))
+       if (stat(passwd, &s))
                return UBUS_STATUS_NOT_FOUND;
 
        if (!(s.st_mode & S_IXUSR))
@@ -119,7 +130,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
                if (ret < 0)
                        return rpc_errno_status();
 
-               if (execl("/usr/bin/passwd", "/usr/bin/passwd",
+               if (execl(passwd, passwd,
                          blobmsg_data(tb[RPC_P_USER]), NULL))
                        return rpc_errno_status();
 
@@ -135,7 +146,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj,
                if (n < 0)
                        return rpc_errno_status();
 
-               usleep(100 * 1000);
+               nanosleep(&ts, NULL);
 
                n = write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]),
                              blobmsg_data_len(tb[RPC_P_PASSWORD]) - 1);
@@ -158,11 +169,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;
@@ -209,6 +228,18 @@ procstr:
                        continue;
                }
 
+               /* If there is ABIVersion, remove that suffix */
+               if (!strcmp(var, "ABIVersion:")) {
+                       if (strlen(pkg) <= strlen(p1))
+                               continue;
+                       tmp = &pkg[strlen(pkg) - strlen(p1)];
+                       if (strncmp(p1, tmp, strlen(p1)))
+                               continue;
+
+                       *tmp = '\0';
+                       continue;
+               }
+
                if (!strcmp(var, "Version:")) {
                        strncpy(ver, p1, sizeof(ver));
                        continue;
@@ -217,7 +248,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';
@@ -226,6 +257,7 @@ procstr:
 
        blobmsg_close_table(&buf, tbl);
        ubus_send_reply(ctx, req, buf.head);
+       blob_buf_free(&buf);
        fclose(f);
 
        return 0;
@@ -312,7 +344,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,