diff options
Diffstat (limited to 'app_control/app_control.c')
| -rwxr-xr-x | app_control/app_control.c | 95 |
1 files changed, 46 insertions, 49 deletions
diff --git a/app_control/app_control.c b/app_control/app_control.c index b63d7fc..095c80d 100755 --- a/app_control/app_control.c +++ b/app_control/app_control.c @@ -23,7 +23,6 @@ #include <bundle.h> #include <bundle_internal.h> #include <aul.h> -#include <appsvc.h> #include <aul_svc.h> #include <dlog.h> @@ -74,8 +73,6 @@ typedef struct app_control_request_context_s { void *user_data; } *app_control_request_context_h; -extern int appsvc_allow_transient_app(bundle *b, unsigned int id); -extern int appsvc_request_transient_app(bundle *b, unsigned int callee_id, appsvc_host_res_fn cbfunc, void *data); static int app_control_create_reply(bundle *data, struct app_control_s **app_control); static const char *app_control_error_to_string(app_control_error_e error) @@ -158,7 +155,7 @@ int app_control_validate_internal_key(const char *key) } /* LCOV_EXCL_START */ -static void app_control_request_result_broker(bundle *appsvc_bundle, int appsvc_request_code, appsvc_result_val appsvc_result, void *appsvc_data) +static void app_control_request_result_broker(bundle *appsvc_bundle, int appsvc_request_code, aul_svc_result_val appsvc_result, void *appsvc_data) { app_control_request_context_h request_context; app_control_h request; @@ -181,13 +178,13 @@ static void app_control_request_result_broker(bundle *appsvc_bundle, int appsvc_ request = request_context->app_control; switch (appsvc_result) { - case APPSVC_RES_OK: + case AUL_SVC_RES_OK: result = APP_CONTROL_RESULT_SUCCEEDED; break; - case APPSVC_RES_NOT_OK: + case AUL_SVC_RES_NOT_OK: result = APP_CONTROL_RESULT_FAILED; break; - case APPSVC_RES_CANCEL: + case AUL_SVC_RES_CANCEL: result = APP_CONTROL_RESULT_CANCELED; break; default: @@ -265,9 +262,9 @@ int app_control_create_event(bundle *data, struct app_control_s **app_control) app_control_event->data = bundle_dup(data); app_control_event->id = app_control_new_id(); - operation = appsvc_get_operation(app_control_event->data); + operation = aul_svc_get_operation(app_control_event->data); if (operation == NULL) - appsvc_set_operation(app_control_event->data, APP_CONTROL_OPERATION_DEFAULT); + aul_svc_set_operation(app_control_event->data, APP_CONTROL_OPERATION_DEFAULT); *app_control = app_control_event; @@ -328,7 +325,7 @@ int app_control_set_operation(app_control_h app_control, const char *operation) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); if (operation != NULL) { - if (appsvc_set_operation(app_control->data, operation) != 0) + if (aul_svc_set_operation(app_control->data, operation) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "invalid operation"); } else { bundle_del(app_control->data, BUNDLE_KEY_OPERATION); @@ -344,7 +341,7 @@ int app_control_get_operation(app_control_h app_control, char **operation) if (app_control_validate(app_control) || operation == NULL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - operation_value = appsvc_get_operation(app_control->data); + operation_value = aul_svc_get_operation(app_control->data); if (operation_value != NULL) *operation = strdup(operation_value); else @@ -359,7 +356,7 @@ int app_control_set_uri(app_control_h app_control, const char *uri) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); if (uri != NULL) { - if (appsvc_set_uri(app_control->data, uri) != 0) + if (aul_svc_set_uri(app_control->data, uri) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "invalid URI"); } else { bundle_del(app_control->data, BUNDLE_KEY_URI); @@ -375,7 +372,7 @@ int app_control_get_uri(app_control_h app_control, char **uri) if (app_control_validate(app_control) || uri == NULL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - uri_value = appsvc_get_uri(app_control->data); + uri_value = aul_svc_get_uri(app_control->data); if (uri_value != NULL) *uri = strdup(uri_value); else @@ -390,7 +387,7 @@ int app_control_set_mime(app_control_h app_control, const char *mime) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); if (mime != NULL) { - if (appsvc_set_mime(app_control->data, mime) != 0) + if (aul_svc_set_mime(app_control->data, mime) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "invalid MIME type"); } else { bundle_del(app_control->data, BUNDLE_KEY_MIME); @@ -406,7 +403,7 @@ int app_control_get_mime(app_control_h app_control, char **mime) if (app_control_validate(app_control) || mime == NULL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - mime_value = appsvc_get_mime(app_control->data); + mime_value = aul_svc_get_mime(app_control->data); if (mime_value != NULL) *mime = strdup(mime_value); else @@ -421,7 +418,7 @@ int app_control_set_category(app_control_h app_control, const char *category) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); if (category != NULL) { - if (appsvc_set_category(app_control->data, category) != 0) + if (aul_svc_set_category(app_control->data, category) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "invalid Category"); } else { bundle_del(app_control->data, BUNDLE_KEY_CATEGORY); @@ -437,7 +434,7 @@ int app_control_get_category(app_control_h app_control, char **category) if (app_control_validate(app_control) || category == NULL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - category_value = appsvc_get_category(app_control->data); + category_value = aul_svc_get_category(app_control->data); if (category_value != NULL) *category = strdup(category_value); else @@ -464,7 +461,7 @@ int app_control_set_app_id(app_control_h app_control, const char *app_id) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); if (app_id != NULL) { - if (appsvc_set_appid(app_control->data, app_id) != 0) + if (aul_svc_set_appid(app_control->data, app_id) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "invalid application ID"); } else { bundle_del(app_control->data, BUNDLE_KEY_PACKAGE); @@ -480,7 +477,7 @@ int app_control_get_app_id(app_control_h app_control, char **app_id) if (app_control_validate(app_control) || app_id == NULL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - app_id_value = appsvc_get_appid(app_control->data); + app_id_value = aul_svc_get_appid(app_control->data); if (app_id_value != NULL) *app_id = strdup(app_id_value); else @@ -495,7 +492,7 @@ int app_control_set_window(app_control_h app_control, unsigned int id) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); if (id > 0) { - if (appsvc_allow_transient_app(app_control->data, id) != 0) + if (aul_svc_allow_transient_app(app_control->data, id) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "invalid id"); } else { bundle_del(app_control->data, BUNDLE_KEY_WINDOW); @@ -562,7 +559,7 @@ int app_control_set_launch_mode(app_control_h app_control, __FUNCTION__, "invalid mode"); } - return appsvc_set_launch_mode(app_control->data, launch_mode); + return aul_svc_set_launch_mode(app_control->data, launch_mode); } int app_control_get_launch_mode(app_control_h app_control, @@ -575,7 +572,7 @@ int app_control_get_launch_mode(app_control_h app_control, __FUNCTION__, NULL); } - launch_mode = appsvc_get_launch_mode(app_control->data); + launch_mode = aul_svc_get_launch_mode(app_control->data); if (launch_mode == NULL) { *mode = APP_CONTROL_LAUNCH_MODE_SINGLE; } else { @@ -707,7 +704,7 @@ int app_control_send_launch_request(app_control_h app_control, app_control_reply if (app_control_validate(app_control)) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - operation = appsvc_get_operation(app_control->data); + operation = aul_svc_get_operation(app_control->data); if (operation == NULL) { implicit_default_operation = true; operation = APP_CONTROL_OPERATION_DEFAULT; @@ -721,7 +718,7 @@ int app_control_send_launch_request(app_control_h app_control, app_control_reply /* operation : default */ if (!strcmp(operation, APP_CONTROL_OPERATION_DEFAULT)) { - const char *appid = appsvc_get_appid(app_control->data); + const char *appid = aul_svc_get_appid(app_control->data); if (appid == NULL) return app_control_error(APP_CONTROL_ERROR_APP_NOT_FOUND, __FUNCTION__, "package must be specified if the operation is default value"); } @@ -746,9 +743,9 @@ int app_control_send_launch_request(app_control_h app_control, app_control_reply } if (implicit_default_operation == true) - appsvc_set_operation(app_control->data, APP_CONTROL_OPERATION_DEFAULT); + aul_svc_set_operation(app_control->data, APP_CONTROL_OPERATION_DEFAULT); - launch_pid = appsvc_usr_run_service(app_control->data, app_control->id, callback ? app_control_request_result_broker : NULL, request_context, getuid()); + launch_pid = aul_svc_run_service_for_uid(app_control->data, app_control->id, callback ? app_control_request_result_broker : NULL, request_context, getuid()); if (implicit_default_operation == true) bundle_del(app_control->data, BUNDLE_KEY_OPERATION); @@ -760,11 +757,11 @@ int app_control_send_launch_request(app_control_h app_control, app_control_reply free(request_context); } - if (launch_pid == APPSVC_RET_ENOMATCH) + if (launch_pid == AUL_SVC_RET_ENOMATCH) return app_control_error(APP_CONTROL_ERROR_APP_NOT_FOUND, __FUNCTION__, NULL); - else if (launch_pid == APPSVC_RET_EILLACC) + else if (launch_pid == AUL_SVC_RET_EILLACC) return app_control_error(APP_CONTROL_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL); - else if (launch_pid == APPSVC_RET_EINVAL) + else if (launch_pid == AUL_SVC_RET_EINVAL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); else return app_control_error(APP_CONTROL_ERROR_LAUNCH_REJECTED, __FUNCTION__, NULL); @@ -803,7 +800,7 @@ int app_control_send_terminate_request(app_control_h app_control) if (app_control->type != APP_CONTROL_TYPE_REQUEST || app_control->launch_pid < 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - appsvc_subapp_terminate_request_pid(app_control->launch_pid); + aul_svc_subapp_terminate_request_pid(app_control->launch_pid); return APP_CONTROL_ERROR_NONE; } @@ -822,9 +819,9 @@ static bool app_control_copy_reply_data_cb(app_control_h app_control, const char return false; } - if (appsvc_data_is_array(app_control->data, key)) { + if (aul_svc_data_is_array(app_control->data, key)) { app_control_get_extra_data_array(app_control, key, &value_array, &value_array_length); - appsvc_add_data_array(reply_data, key, (const char **)value_array, value_array_length); + aul_svc_add_data_array(reply_data, key, (const char **)value_array, value_array_length); for (value_array_index = 0; value_array_index < value_array_length; value_array_index++) free(value_array[value_array_index]); @@ -832,7 +829,7 @@ static bool app_control_copy_reply_data_cb(app_control_h app_control, const char free(value_array); } else { app_control_get_extra_data(app_control, key, &value); - appsvc_add_data(reply_data, key, value); + aul_svc_add_data(reply_data, key, value); free(value); } @@ -852,30 +849,30 @@ int app_control_reply_to_launch_request(app_control_h reply, app_control_h reque if (result == APP_CONTROL_RESULT_APP_STARTED) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "APP_CONTROL_RESULT_APP_STARTED is not allowed to use"); - if (appsvc_create_result_bundle(request->data, &reply_data) != 0) + if (aul_svc_create_result_bundle(request->data, &reply_data) != 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, "failed to create a result bundle"); app_control_foreach_extra_data(reply, app_control_copy_reply_data_cb, reply_data); switch (result) { case APP_CONTROL_RESULT_SUCCEEDED: - appsvc_result = APPSVC_RES_OK; + appsvc_result = AUL_SVC_RES_OK; break; case APP_CONTROL_RESULT_FAILED: - appsvc_result = APPSVC_RES_NOT_OK; + appsvc_result = AUL_SVC_RES_NOT_OK; break; case APP_CONTROL_RESULT_CANCELED: - appsvc_result = APPSVC_RES_CANCEL; + appsvc_result = AUL_SVC_RES_CANCEL; break; default: - appsvc_result = APPSVC_RES_CANCEL; + appsvc_result = AUL_SVC_RES_CANCEL; break; } - ret = appsvc_send_result(reply_data, appsvc_result); + ret = aul_svc_send_result(reply_data, appsvc_result); bundle_free(reply_data); if (ret < 0) { - if (ret == APPSVC_RET_EINVAL) + if (ret == AUL_SVC_RET_EINVAL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); else return app_control_error(APP_CONTROL_ERROR_LAUNCH_REJECTED, __FUNCTION__, NULL); @@ -893,12 +890,12 @@ int app_control_add_extra_data(app_control_h app_control, const char *key, const if (app_control_validate_internal_key(key)) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "the given key is reserved as internal use"); - if (appsvc_get_data(app_control->data, key) != NULL) { + if (aul_svc_get_data(app_control->data, key) != NULL) { /* overwrite any existing value */ bundle_del(app_control->data, key); } - if (appsvc_add_data(app_control->data, key, value) != 0) + if (aul_svc_add_data(app_control->data, key, value) != 0) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "failed to add data to the appsvc handle"); return APP_CONTROL_ERROR_NONE; @@ -916,12 +913,12 @@ int app_control_add_extra_data_array(app_control_h app_control, const char *key, if (app_control_validate_internal_key(key)) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "the given key is reserved as internal use"); - if (appsvc_get_data_array(app_control->data, key, NULL) != NULL) { + if (aul_svc_get_data_array(app_control->data, key, NULL) != NULL) { /* overwrite any existing value */ bundle_del(app_control->data, key); } - if (appsvc_add_data_array(app_control->data, key, value, length) != 0) + if (aul_svc_add_data_array(app_control->data, key, value, length) != 0) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "failed to add array data to the appsvc handle"); return APP_CONTROL_ERROR_NONE; @@ -951,7 +948,7 @@ int app_control_get_extra_data(app_control_h app_control, const char *key, char if (app_control_validate_internal_key(key)) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "the given key is reserved as internal use"); - data_value = appsvc_get_data(app_control->data, key); + data_value = aul_svc_get_data(app_control->data, key); if (data_value == NULL) { if (errno == ENOTSUP) return app_control_error(APP_CONTROL_ERROR_INVALID_DATA_TYPE, __FUNCTION__, NULL); @@ -980,7 +977,7 @@ int app_control_get_extra_data_array(app_control_h app_control, const char *key, if (app_control_validate_internal_key(key)) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "the given key is reserved as internal use"); - array_data = appsvc_get_data_array(app_control->data, key, &array_data_length); + array_data = aul_svc_get_data_array(app_control->data, key, &array_data_length); if (array_data == NULL) { if (errno == ENOTSUP) return app_control_error(APP_CONTROL_ERROR_INVALID_DATA_TYPE, __FUNCTION__, NULL); @@ -1011,7 +1008,7 @@ int app_control_is_extra_data_array(app_control_h app_control, const char *key, if (app_control_validate_internal_key(key)) return app_control_error(APP_CONTROL_ERROR_KEY_REJECTED, __FUNCTION__, "the given key is reserved as internal use"); - if (!appsvc_data_is_array(app_control->data, key)) + if (!aul_svc_data_is_array(app_control->data, key)) *array = false; else *array = true; @@ -1116,7 +1113,7 @@ int app_control_foreach_app_matched(app_control_h app_control, app_control_app_m if (app_control_validate(app_control) || callback == NULL) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - appsvc_usr_get_list(app_control->data, app_control_cb_broker_foreach_app_matched, &foreach_context, getuid()); + aul_svc_get_list_for_uid(app_control->data, app_control_cb_broker_foreach_app_matched, &foreach_context, getuid()); return APP_CONTROL_ERROR_NONE; } @@ -1206,7 +1203,7 @@ int app_control_request_transient_app(app_control_h app_control, unsigned int ca if (app_control_validate(app_control)) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - ret = appsvc_request_transient_app(app_control->data, callee_id, (appsvc_host_res_fn)cbfunc, data); + ret = aul_svc_request_transient_app(app_control->data, callee_id, (aul_svc_host_res_fn)cbfunc, data); if (ret < 0) return app_control_error(APP_CONTROL_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); |