cd8f896 debug: expand more sql messages — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

debug: expand more sql messages

Baptiste Daroussin committed 5 years ago

commit cd8f896d23d55516737f5886a7f69a6e1cc3c77d
parent 2638639

2 files changed +13 -13

modified libpkg/pkgdb.c

@@ -2230,12 +2230,12 @@ pkgdb_reanalyse_shlibs(struct pkgdb *db, struct pkg *pkg)

 		for (i = 0; i < 2; i++) {
 			/* Clean out old shlibs first */
 			pkg_debug(4, "Pkgdb: running '%s'", sql[i]);
 			stmt_del = prepare_sql(db->sqlite, sql[i]);
 			if (stmt_del == NULL)
 				return (EPKG_FATAL);
 			sqlite3_bind_int64(stmt_del, 1, package_id);
 			pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt_del));
 			ret = sqlite3_step(stmt_del);

@@ -2440,12 +2440,12 @@ pkgdb_unregister_pkg(struct pkgdb *db, int64_t id)

 	assert(db != NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	stmt_del = prepare_sql(db->sqlite, sql);
 	if (stmt_del == NULL)
 		return (EPKG_FATAL);
 	sqlite3_bind_int64(stmt_del, 1, id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt_del));
 	ret = sqlite3_step(stmt_del);

@@ -2595,7 +2595,6 @@ pkgdb_vset(struct pkgdb *db, int64_t id, va_list ap)

 	};
 	while ((attr = va_arg(ap, int)) > 0) {
 		pkg_debug(4, "Pkgdb: running '%s'", sql[attr]);
 		stmt = prepare_sql(db->sqlite, sql[attr]);
 		if (stmt == NULL)
 			return (EPKG_FATAL);

@@ -2637,6 +2636,7 @@ pkgdb_vset(struct pkgdb *db, int64_t id, va_list ap)

 			break;
 		}
 		pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 		if (sqlite3_step(stmt) != SQLITE_DONE) {
 			ERROR_STMT_SQLITE(db->sqlite, stmt);
 			sqlite3_finalize(stmt);

@@ -2671,12 +2671,12 @@ pkgdb_file_set_cksum(struct pkgdb *db, struct pkg_file *file,

 	const char	 sql_file_update[] = ""
 		"UPDATE files SET sha256 = ?1 WHERE path = ?2";
 	pkg_debug(4, "Pkgdb: running '%s'", sql_file_update);
 	stmt = prepare_sql(db->sqlite, sql_file_update);
 	if (stmt == NULL)
 		return (EPKG_FATAL);
 	sqlite3_bind_text(stmt, 1, sum, -1, SQLITE_STATIC);
 	sqlite3_bind_text(stmt, 2, file->path, -1, SQLITE_STATIC);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	if (sqlite3_step(stmt) != SQLITE_DONE) {
 		ERROR_STMT_SQLITE(db->sqlite, stmt);

modified libpkg/pkgdb_iterator.c

@@ -135,13 +135,13 @@ load_val(sqlite3 *db, struct pkg *pkg, const char *sql, unsigned flags,

 	if (pkg->flags & flags)
 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(db, sql);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_adddata(pkg, sqlite3_column_text(stmt, 0));

@@ -173,13 +173,13 @@ load_tag_val(sqlite3 *db, struct pkg *pkg, const char *sql, unsigned flags,

 	if (pkg->flags & flags)
 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(db, sql);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_addtagval(pkg, sqlite3_column_text(stmt, 0),

@@ -242,7 +242,6 @@ pkgdb_load_deps(sqlite3 *sqlite, struct pkg *pkg)

 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	ret = sqlite3_prepare_v2(sqlite, sql, -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {

@@ -251,6 +250,7 @@ pkgdb_load_deps(sqlite3 *sqlite, struct pkg *pkg)

 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	/* XXX: why we used locked here ? */
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {

@@ -378,7 +378,6 @@ pkgdb_load_rdeps(sqlite3 *sqlite, struct pkg *pkg)

 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	ret = sqlite3_prepare_v2(sqlite, sql, -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {

@@ -387,6 +386,7 @@ pkgdb_load_rdeps(sqlite3 *sqlite, struct pkg *pkg)

 	}
 	sqlite3_bind_text(stmt, 1, pkg->uid, -1, SQLITE_STATIC);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	/* XXX: why we used locked here ? */
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {

@@ -430,13 +430,13 @@ pkgdb_load_files(sqlite3 *sqlite, struct pkg *pkg)

 	if (pkg->flags & PKG_LOAD_FILES)
 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(sqlite, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sql);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_addfile(pkg, sqlite3_column_text(stmt, 0),

@@ -444,13 +444,13 @@ pkgdb_load_files(sqlite3 *sqlite, struct pkg *pkg)

 	}
 	sqlite3_finalize(stmt);
 	pkg_debug(4, "Pkgdb: running '%s'", sql2);
 	if (sqlite3_prepare_v2(sqlite, sql2, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sql2);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_addconfig_file(pkg, sqlite3_column_text(stmt, 0),

@@ -487,13 +487,13 @@ pkgdb_load_dirs(sqlite3 *sqlite, struct pkg *pkg)

 	if (pkg->flags & PKG_LOAD_DIRS)
 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(sqlite, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sql);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_adddir(pkg, sqlite3_column_text(stmt, 0), false);

@@ -649,13 +649,13 @@ pkgdb_load_lua_scripts(sqlite3 *sqlite, struct pkg *pkg)

 	if (pkg->flags & PKG_LOAD_LUA_SCRIPTS)
 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(sqlite, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sql);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_add_lua_script(pkg, sqlite3_column_text(stmt, 0),

@@ -690,13 +690,13 @@ pkgdb_load_scripts(sqlite3 *sqlite, struct pkg *pkg)

 	if (pkg->flags & PKG_LOAD_SCRIPTS)
 		return (EPKG_OK);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(sqlite, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sql);
 		return (EPKG_FATAL);
 	}
 	sqlite3_bind_int64(stmt, 1, pkg->id);
 	pkg_debug(4, "Pkgdb: running '%s'", sqlite3_expanded_sql(stmt));
 	while ((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
 		pkg_addscript(pkg, sqlite3_column_text(stmt, 0),