207d900 Fix pkgdb_compact() — HardenedBSD-pkg

HardenedBSD Package Manager

Fix pkgdb_compact()

jlaffaye committed 15 years ago

commit 207d900dc7617cdee6eee276636e37f92c7ee052
parent e734327baefd1ecb5d2af8d82d1ab46dddeefb46

2 files changed +13 -6

modified libpkg/pkgdb.c

@@ -1229,6 +1229,7 @@ static int get_pragma(sqlite3 *s, const char *sql, int *res) {

 	*res = sqlite3_column_int(stmt, 0);
 	sqlite3_finalize(stmt);
 	return (EPKG_OK);
 }

@@ -1239,18 +1240,21 @@ pkgdb_compact(struct pkgdb *db)

 	int freelist_count = 0;
 	char *errmsg;
 	int retcode = EPKG_OK;
 	int ret;
 	if (db == NULL)
 		return (ERROR_BAD_ARG("db"));
 	ret += get_pragma(db->sqlite, "PRAGMA page_count;", &page_count);
 	ret += get_pragma(db->sqlite, "PRAGMA freelist_count;", &freelist_count);
 	if (get_pragma(db->sqlite, "PRAGMA page_count;", &page_count) != EPKG_OK)
 		return (EPKG_FATAL);
 	if (ret != EPKG_OK)
 	if (get_pragma(db->sqlite, "PRAGMA freelist_count;", &freelist_count) !=
 		EPKG_OK)
 		return (EPKG_FATAL);
 	if (freelist_count == 0 || page_count / freelist_count < 0.25)
 	/*
 	 * Only compact if we will save 25% (or more) of the current used space.
 	 */
 	if (freelist_count / (float)page_count < 0.25)
 		return (EPKG_OK);
 	if (sqlite3_exec(db->sqlite, "VACUUM;", NULL, NULL, &errmsg) != SQLITE_OK){

modified pkg/delete.c

@@ -76,7 +76,10 @@ exec_delete(int argc, char **argv)

 	}
 	pkgdb_it_free(it);
 	pkgdb_compact(db);
 	if (pkgdb_compact(db) != EPKG_OK)
 		pkg_error_warn("can not compact database");
 	pkgdb_close(db);
 	return (retcode);
 }