X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpkgmgrinfo_certinfo.c;h=7535c936a78fcfdbdcd84bb357c920fcd3bf0ce4;hb=2cb16e8b5927f1b32d5c6eda7c84689dd9de4c86;hp=3688488fd5afd8c0ded515f4186d3c08e8c02619;hpb=fe3d4a9d89e0e4935641f719431944848a8d9012;p=platform%2Fcore%2Fappfw%2Fpkgmgr-info.git

diff --git a/src/pkgmgrinfo_certinfo.c b/src/pkgmgrinfo_certinfo.c
index 3688488..7535c93 100644
--- a/src/pkgmgrinfo_certinfo.c
+++ b/src/pkgmgrinfo_certinfo.c
@@ -116,7 +116,7 @@ API int pkgmgrinfo_pkginfo_compare_usr_pkg_cert_info(const char *lhs_package_id,
 {
 	int ret;
 	sqlite3 *db;
-	const char *dbpath;
+	char *dbpath;
 
 	if (lhs_package_id == NULL || rhs_package_id == NULL ||
 			compare_result == NULL) {
@@ -129,11 +129,13 @@ API int pkgmgrinfo_pkginfo_compare_usr_pkg_cert_info(const char *lhs_package_id,
 	if (dbpath == NULL)
 		return PMINFO_R_ERROR;
 
-	ret = sqlite3_open_v2(dbpath, &db, SQLITE_OPEN_READONLY, NULL);
+	ret = __open_db(dbpath, &db, SQLITE_OPEN_READONLY);
 	if (ret != SQLITE_OK) {
 		_LOGE("failed to open db: %d", ret);
+		free(dbpath);
 		return PMINFO_R_ERROR;
 	}
+	free(dbpath);
 
 	if (_pkginfo_compare_certinfo(db, lhs_package_id, rhs_package_id,
 				compare_result)) {
@@ -159,18 +161,20 @@ static int _pkginfo_get_pkgid_from_appid(uid_t uid, const char *appid,
 		"SELECT package FROM package_app_info WHERE app_id=?";
 	int ret;
 	sqlite3 *db;
-	const char *dbpath;
+	char *dbpath;
 	sqlite3_stmt *stmt;
 
 	dbpath = getUserPkgParserDBPathUID(uid);
 	if (dbpath == NULL)
 		return PMINFO_R_ERROR;
 
-	ret = sqlite3_open_v2(dbpath, &db, SQLITE_OPEN_READONLY, NULL);
+	ret = __open_db(dbpath, &db, SQLITE_OPEN_READONLY);
 	if (ret != SQLITE_OK) {
 		_LOGE("failed to open db: %d", ret);
+		free(dbpath);
 		return PMINFO_R_ERROR;
 	}
+	free(dbpath);
 
 	ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
 	if (ret != SQLITE_OK) {
@@ -356,18 +360,20 @@ static int _pkginfo_get_certinfo(const char *pkgid, pkgmgr_certinfo_x *info)
 {
 	int ret;
 	sqlite3 *db;
-	const char *dbpath;
+	char *dbpath;
 
 	/* open unified global cert db */
 	dbpath = getUserPkgCertDBPathUID(GLOBAL_USER);
 	if (dbpath == NULL)
 		return PMINFO_R_ERROR;
 
-	ret = sqlite3_open_v2(dbpath, &db, SQLITE_OPEN_READONLY, NULL);
+	ret = __open_db(dbpath, &db, SQLITE_OPEN_READONLY);
 	if (ret != SQLITE_OK) {
 		_LOGE("failed to open db: %d", ret);
+		free(dbpath);
 		return PMINFO_R_ERROR;
 	}
+	free(dbpath);
 
 	ret = _pkginfo_get_certid(db, pkgid, info->cert_id);
 	if (ret != PMINFO_R_OK) {
@@ -381,6 +387,8 @@ static int _pkginfo_get_certinfo(const char *pkgid, pkgmgr_certinfo_x *info)
 		return ret;
 	}
 
+	sqlite3_close_v2(db);
+
 	return PMINFO_R_OK;
 }
 
@@ -464,11 +472,11 @@ static int _pkginfo_save_cert_info(sqlite3 *db, const char *pkgid,
 		char *cert_info[])
 {
 	static const char query_insert[] =
-		"INSERT INTO package_cert_info (package,"
+		"INSERT INTO package_cert_info (package, package_count,"
 		" author_root_cert, author_im_cert, author_signer_cert,"
 		" dist_root_cert, dist_im_cert, dist_signer_cert,"
 		" dist2_root_cert, dist2_im_cert, dist2_signer_cert) "
-		"VALUES(?, "
+		"VALUES(?, 1,"
 		" (SELECT cert_id FROM package_cert_index_info"
 		"  WHERE cert_info=?),"
 		" (SELECT cert_id FROM package_cert_index_info"
@@ -488,34 +496,8 @@ static int _pkginfo_save_cert_info(sqlite3 *db, const char *pkgid,
 		" (SELECT cert_id FROM package_cert_index_info"
 		"  WHERE cert_info=?))";
 	static const char query_update[] =
-		"UPDATE package_cert_info SET "
-		" author_root_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		" author_im_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		" author_signer_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		" dist_root_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		" dist_im_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		" dist_signer_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		" dist2_root_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		"dist2_im_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?),"
-		"dist2_signer_cert= "
-		"  (SELECT cert_id FROM package_cert_index_info"
-		"   WHERE cert_info=?) "
+		"UPDATE package_cert_info "
+		"SET package_count = package_count + 1 "
 		"WHERE package=?";
 	int ret;
 	sqlite3_stmt *stmt;
@@ -549,16 +531,7 @@ static int _pkginfo_save_cert_info(sqlite3 *db, const char *pkgid,
 			_LOGE("prepare error: %s", sqlite3_errmsg(db));
 			return PMINFO_R_ERROR;
 		}
-		idx = 1;
-		for (i = 0; i < MAX_CERT_TYPE; i++) {
-			if (sqlite3_bind_text(stmt, idx++, cert_info[i], -1,
-					SQLITE_STATIC)) {
-				_LOGE("bind error: %s", sqlite3_errmsg(db));
-				sqlite3_finalize(stmt);
-				return PMINFO_R_ERROR;
-			}
-		}
-		sqlite3_bind_text(stmt, idx++, pkgid, -1, SQLITE_STATIC);
+		sqlite3_bind_text(stmt, 1, pkgid, -1, SQLITE_STATIC);
 		ret = sqlite3_step(stmt);
 		sqlite3_finalize(stmt);
 	}
@@ -622,7 +595,7 @@ API int pkgmgrinfo_save_certinfo(const char *pkgid, pkgmgrinfo_instcertinfo_h ha
 {
 	int ret;
 	sqlite3 *db;
-	const char *dbpath;
+	char *dbpath;
 	pkgmgr_instcertinfo_x *info = (pkgmgr_instcertinfo_x *)handle;
 
 	if (pkgid == NULL || handle == NULL) {
@@ -635,11 +608,13 @@ API int pkgmgrinfo_save_certinfo(const char *pkgid, pkgmgrinfo_instcertinfo_h ha
 	if (dbpath == NULL)
 		return PMINFO_R_ERROR;
 
-	ret = sqlite3_open_v2(dbpath, &db, SQLITE_OPEN_READWRITE, NULL);
+	ret = __open_db(dbpath, &db, SQLITE_OPEN_READWRITE);
 	if (ret != SQLITE_OK) {
 		_LOGE("failed to open db: %d", ret);
+		free(dbpath);
 		return PMINFO_R_ERROR;
 	}
+	free(dbpath);
 
 	ret = sqlite3_exec(db, "BEGIN EXCLUSIVE", NULL, NULL, NULL);
 	if (ret != SQLITE_OK) {
@@ -656,6 +631,7 @@ API int pkgmgrinfo_save_certinfo(const char *pkgid, pkgmgrinfo_instcertinfo_h ha
 		sqlite3_close_v2(db);
 		return PMINFO_R_ERROR;
 	}
+
 	if (_pkginfo_save_cert_info(db, pkgid, info->cert_info)) {
 		_LOGE("failed to save cert info, rollback now");
 		sqlite3_exec(GET_DB(cert_db), "ROLLBACK", NULL, NULL, NULL);
@@ -700,7 +676,9 @@ API int pkgmgrinfo_destroy_certinfo_set_handle(pkgmgrinfo_instcertinfo_h handle)
 static int _pkginfo_delete_certinfo(sqlite3 *db, const char *pkgid)
 {
 	static const char query[] =
-		"DELETE FROM package_cert_info WHERE package=?";
+		"UPDATE package_cert_info "
+		"SET package_count = package_count - 1 "
+		"WHERE package=?";
 	int ret;
 	sqlite3_stmt *stmt;
 
@@ -731,7 +709,7 @@ API int pkgmgrinfo_delete_usr_certinfo(const char *pkgid, uid_t uid)
 {
 	int ret;
 	sqlite3 *db;
-	const char *dbpath;
+	char *dbpath;
 
 	if (pkgid == NULL) {
 		_LOGE("invalid parameter");
@@ -743,11 +721,13 @@ API int pkgmgrinfo_delete_usr_certinfo(const char *pkgid, uid_t uid)
 	if (dbpath == NULL)
 		return PMINFO_R_ERROR;
 
-	ret = sqlite3_open_v2(dbpath, &db, SQLITE_OPEN_READWRITE, NULL);
+	ret = __open_db(dbpath, &db, SQLITE_OPEN_READWRITE);
 	if (ret != SQLITE_OK) {
 		_LOGE("failed to open db: %d", ret);
+		free(dbpath);
 		return PMINFO_R_ERROR;
 	}
+	free(dbpath);
 
 	ret = sqlite3_exec(db, "BEGIN EXCLUSIVE", NULL, NULL, NULL);
 	if (ret != SQLITE_OK) {