summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/app_group.c36
-rw-r--r--src/pkginfo.c82
2 files changed, 48 insertions, 70 deletions
diff --git a/src/app_group.c b/src/app_group.c
index cfe47b1b..afaea093 100644
--- a/src/app_group.c
+++ b/src/app_group.c
@@ -72,20 +72,20 @@ API int aul_app_group_set_window(int wid)
API void aul_app_group_get_leader_pids(int *cnt, int **pids)
{
int ret;
+ int fd;
app_pkt_t *pkt = NULL;
int c;
*cnt = 0;
*pids = NULL;
- ret = aul_sock_send_raw(AUL_UTIL_PID, getuid(), APP_GROUP_GET_LEADER_PIDS,
+ fd = aul_sock_send_raw(AUL_UTIL_PID, getuid(), APP_GROUP_GET_LEADER_PIDS,
NULL, 0, AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
-
- if (ret < 0)
+ if (fd > 0)
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ else
return;
- if (pkt == NULL)
+ if (pkt == NULL || ret < 0)
return;
c = pkt->len / sizeof(int);
@@ -107,6 +107,7 @@ API void aul_app_group_get_leader_pids(int *cnt, int **pids)
API void aul_app_group_get_group_pids(int leader_pid, int *cnt, int **pids)
{
int ret;
+ int fd;
app_pkt_t *pkt = NULL;
bundle *b;
char buf[128];
@@ -124,18 +125,17 @@ API void aul_app_group_get_group_pids(int leader_pid, int *cnt, int **pids)
snprintf(buf, 128, "%d", leader_pid);
bundle_add_str(b, AUL_K_LEADER_PID, buf);
- ret = aul_sock_send_bundle(AUL_UTIL_PID, getuid(),
+ fd = aul_sock_send_bundle(AUL_UTIL_PID, getuid(),
APP_GROUP_GET_GROUP_PIDS, b, AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
-
- if (ret < 0) {
+ if (fd > 0) {
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ } else {
bundle_free(b);
return;
}
- if (pkt == NULL) {
+ if (ret < 0 || pkt == NULL) {
bundle_free(b);
return;
}
@@ -239,21 +239,21 @@ API void aul_app_group_lower(int *exit)
API void aul_app_group_get_idle_pids(int *cnt, int **pids)
{
int ret;
+ int fd;
app_pkt_t *pkt = NULL;
int c;
*cnt = 0;
*pids = NULL;
- ret = aul_sock_send_raw(AUL_UTIL_PID, getuid(),
+ fd = aul_sock_send_raw(AUL_UTIL_PID, getuid(),
APP_GROUP_GET_IDLE_PIDS, NULL, 0, AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
-
- if (ret < 0)
+ if (fd > 0)
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ else
return;
- if (pkt == NULL)
+ if (pkt == NULL || ret < 0)
return;
c = pkt->len / sizeof(int);
diff --git a/src/pkginfo.c b/src/pkginfo.c
index b5e32651..a5021758 100644
--- a/src/pkginfo.c
+++ b/src/pkginfo.c
@@ -90,20 +90,20 @@ API int aul_app_get_running_app_info_for_uid(aul_app_info_iter_fn enum_fn,
char *pkt_data;
aul_app_info info;
int ret;
+ int fd;
memset(&info, 0, sizeof(info));
if (enum_fn == NULL)
return AUL_R_EINVAL;
- ret = aul_sock_send_raw(AUL_UTIL_PID, uid, APP_RUNNING_INFO, NULL, 0, AUL_SOCK_ASYNC);
+ fd = aul_sock_send_raw(AUL_UTIL_PID, uid, APP_RUNNING_INFO, NULL, 0, AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
+ if (fd > 0)
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ else
+ return fd;
- if (ret < 0)
- return ret;
-
- if (pkt == NULL)
+ if (pkt == NULL || ret < 0)
return AUL_R_ERROR;
for (pkt_data = (char *)pkt->data; ; pkt_data = NULL) {
@@ -143,20 +143,20 @@ API int aul_app_get_all_running_app_info_for_uid(aul_app_info_iter_fn enum_fn,
char *pkt_data;
aul_app_info info;
int ret;
+ int fd;
memset(&info, 0, sizeof(info));
if (enum_fn == NULL)
return AUL_R_EINVAL;
- ret = aul_sock_send_raw(AUL_UTIL_PID, uid, APP_ALL_RUNNING_INFO, NULL, 0, AUL_SOCK_ASYNC);
-
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
+ fd = aul_sock_send_raw(AUL_UTIL_PID, uid, APP_ALL_RUNNING_INFO, NULL, 0, AUL_SOCK_ASYNC);
- if (ret < 0)
- return ret;
+ if (fd > 0)
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ else
+ return fd;
- if (pkt == NULL)
+ if (pkt == NULL || ret < 0)
return AUL_R_ERROR;
for (pkt_data = (char *)pkt->data; ; pkt_data = NULL) {
@@ -250,18 +250,18 @@ API int aul_app_get_appid_bypid_for_uid(int pid, char *appid, int len, uid_t uid
app_pkt_t *pkt = NULL;
int pgid;
int ret;
+ int fd;
if (pid != getpid()) {
- ret = aul_sock_send_raw(AUL_UTIL_PID, uid, APP_GET_APPID_BYPID,
+ fd = aul_sock_send_raw(AUL_UTIL_PID, uid, APP_GET_APPID_BYPID,
(unsigned char *)&pid,
sizeof(pid), AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
-
- if (ret < 0)
- return ret;
+ if (fd > 0)
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ else
+ return fd;
- if (pkt == NULL)
+ if (pkt == NULL || ret < 0)
return AUL_R_ERROR;
if (pkt->cmd == APP_GET_INFO_ERROR) {
@@ -303,6 +303,7 @@ API int aul_app_get_pkgid_bypid_for_uid(int pid, char *pkgid, int len, uid_t uid
int ret;
int cmd = APP_GET_PKGID_BYPID;
int cpid = getpid();
+ int fd;
if (pid == cpid && __pkgid) {
snprintf(pkgid, len, "%s", __pkgid);
@@ -330,15 +331,14 @@ API int aul_app_get_pkgid_bypid_for_uid(int pid, char *pkgid, int len, uid_t uid
if (pkgid == NULL)
return AUL_R_EINVAL;
- ret = aul_sock_send_raw(AUL_UTIL_PID, uid, cmd, (unsigned char *)&pid, sizeof(pid), AUL_SOCK_ASYNC);
+ fd = aul_sock_send_raw(AUL_UTIL_PID, uid, cmd, (unsigned char *)&pid, sizeof(pid), AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
+ if (fd > 0)
+ ret = aul_sock_recv_reply_pkt(fd, &pkt);
+ else
+ return fd;
- if (ret < 0)
- return ret;
-
- if (pkt == NULL)
+ if (pkt == NULL || ret < 0)
return AUL_R_ERROR;
if (pkt->cmd == APP_GET_INFO_ERROR) {
@@ -359,42 +359,20 @@ API int aul_app_get_pkgid_bypid(int pid, char *pkgid, int len)
API int aul_delete_rua_history(bundle *b)
{
int ret;
- app_pkt_t *pkt = NULL;
bundle_raw *br = NULL;
int datalen = 0;
- int result = 0;
/* b can be NULL if b is NULL delete all rua history */
if (b != NULL)
bundle_encode(b, &br, &datalen);
ret = aul_sock_send_raw(AUL_UTIL_PID, getuid(),
- APP_REMOVE_HISTORY, br, datalen, AUL_SOCK_ASYNC);
- if (ret)
- ret = aul_sock_recv_reply_pkt(ret, &pkt);
-
- if (ret < 0)
- return ret;
-
- if (pkt != NULL) {
- if (pkt->len > 0) {
- memcpy(&result, pkt->data, pkt->len);
- } else {
- if (br != NULL)
- free(br);
- free(pkt);
-
- return AUL_R_ERROR;
- }
-
- free(pkt);
- } else
- result = AUL_R_ERROR;
+ APP_REMOVE_HISTORY, br, datalen, AUL_SOCK_NONE);
if (br != NULL)
free(br);
- return result;
+ return ret;
}
API int aul_set_default_app_by_operation(bundle *b)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 11:50:14 +0000