jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

db: convert v3 scripts to ipkg on install 

fixes #10796
cute-signatures
Timo Teräs 2021-12-03 14:52:07 +02:00
parent 4dde7e7e0f
commit 1ab81fdd4c
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_package.h
View File

@ -144,6 +144,7 @@ void apk_pkg_from_adb(struct apk_database *db, struct apk_package *pkg, struct a
struct apk_installed_package *apk_pkg_install(struct apk_database *db, struct apk_package *pkg);
void apk_pkg_uninstall(struct apk_database *db, struct apk_package *pkg);
int apk_ipkg_assign_script(struct apk_installed_package *ipkg, unsigned int type, apk_blob_t blob);
int apk_ipkg_add_script(struct apk_installed_package *ipkg,
struct apk_istream *is,
unsigned int type, unsigned int size);

2
src/app_mkpkg.c
View File

@ -74,7 +74,7 @@ static int option_parse_applet(void *ctx, struct apk_ctx *ac, int optch, const c
case OPT_MKPKG_script:
apk_blob_split(APK_BLOB_STR(optarg), APK_BLOB_STRLIT(":"), &l, &r);
i = adb_s_field_by_name_blob(&schema_scripts, l);
if (i == APK_SCRIPT_INVALID) {
if (!i) {
apk_err(out, "invalid script type: " BLOB_FMT, BLOB_PRINTF(l));
return -EINVAL;
}

19
src/database.c
View File

@ -2334,10 +2334,19 @@ static int apk_db_install_v2meta(struct apk_extract_ctx *ectx, struct apk_istrea
static int apk_db_install_v3meta(struct apk_extract_ctx *ectx, struct adb_obj *pkg)
{
static const int script_type_to_field[] = {
[APK_SCRIPT_PRE_INSTALL] = ADBI_SCRPT_PREINST,
[APK_SCRIPT_POST_INSTALL] = ADBI_SCRPT_POSTINST,
[APK_SCRIPT_PRE_DEINSTALL] = ADBI_SCRPT_PREDEINST,
[APK_SCRIPT_POST_DEINSTALL] = ADBI_SCRPT_POSTDEINST,
[APK_SCRIPT_PRE_UPGRADE] = ADBI_SCRPT_PREUPGRADE,
[APK_SCRIPT_POST_UPGRADE] = ADBI_SCRPT_POSTUPGRADE,
[APK_SCRIPT_TRIGGER] = ADBI_SCRPT_TRIGGER,
};
struct install_ctx *ctx = container_of(ectx, struct install_ctx, ectx);
struct apk_database *db = ctx->db;
struct apk_installed_package *ipkg = ctx->ipkg;
struct adb_obj triggers, pkginfo, obj;
struct adb_obj scripts, triggers, pkginfo, obj;
int i;
// Extract the information not available in index
@ -2346,6 +2355,14 @@ static int apk_db_install_v3meta(struct apk_extract_ctx *ectx, struct adb_obj *p
ipkg->replaces_priority = adb_ro_int(&pkginfo, ADBI_PI_PRIORITY);
ipkg->v3 = 1;
adb_ro_obj(pkg, ADBI_PKG_SCRIPTS, &scripts);
for (i = 0; i < ARRAY_SIZE(script_type_to_field); i++) {
apk_blob_t b = adb_ro_blob(&scripts, script_type_to_field[i]);
if (APK_BLOB_IS_NULL(b)) continue;
apk_ipkg_assign_script(ipkg, i, apk_blob_dup(b));
ctx->script_pending |= (i == ctx->script);
}
apk_string_array_resize(&ipkg->triggers, 0);
adb_ro_obj(pkg, ADBI_PKG_TRIGGERS, &triggers);
for (i = ADBI_FIRST; i <= adb_ra_num(&triggers); i++)

21
src/package.c
View File

@ -738,18 +738,23 @@ void apk_pkg_free(struct apk_package *pkg)
free(pkg);
}
int apk_ipkg_assign_script(struct apk_installed_package *ipkg, unsigned int type, apk_blob_t b)
{
if (APK_BLOB_IS_NULL(b)) return -1;
if (type >= APK_SCRIPT_MAX) {
free(b.ptr);
return -1;
}
if (ipkg->script[type].ptr) free(ipkg->script[type].ptr);
ipkg->script[type] = b;
return 0;
}
int apk_ipkg_add_script(struct apk_installed_package *ipkg,
struct apk_istream *is,
unsigned int type, unsigned int size)
{
apk_blob_t b;
if (type >= APK_SCRIPT_MAX) return -1;
b = apk_blob_from_istream(is, size);
if (APK_BLOB_IS_NULL(b)) return -1;
if (ipkg->script[type].ptr) free(ipkg->script[type].ptr);
ipkg->script[type] = b;
return 0;
return apk_ipkg_assign_script(ipkg, type, apk_blob_from_istream(is, size));
}
void apk_ipkg_run_script(struct apk_installed_package *ipkg,