Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 40ba738
Sort packages
Philippe Pepiot committed 15 years ago
commit 40ba738085ebf9f24ca27cceb8c75cdd972ba83c
parent a89521e
1 file changed +25 -5
modified libpkg/pkgdb_cache.c
@@ -286,14 +286,24 @@ pkgdb_cache_update()
		pkgdb_cache_rebuild(pkg_dbdir, cache_path);

}
+ 
static int
+ 
pkg_cmp(void const *a, void const *b)
+ 
{
+ 
	struct pkg * const *pa = a;
+ 
	struct pkg * const *pb = b;
+ 
	return (strcmp((*pa)->name, (*pb)->name));
+ 
}
+ 


void

pkgdb_cache_init(struct pkgdb *db, const char *pattern)

{
- 
	int count;
- 
	int i;
+ 
	int count, i;

	struct pkg *pkg;
+ 
	struct pkg **pkgs;
+ 
	TAILQ_HEAD(, pkg) head;

	char *name;
+ 
	TAILQ_INIT(&head);

	TAILQ_INIT(&db->pkgs);

	db->count = 0;
@@ -319,9 +329,8 @@ pkgdb_cache_init(struct pkgdb *db, const char *pattern)
		}



		if (!pattern || strncmp(name, pattern, strlen(pattern)) == 0) {
- 
			/* ok we find one pkg matching the pattern */
- 
				TAILQ_INSERT_TAIL(&db->pkgs, pkg, entry);
- 
				db->count++;
+ 
			TAILQ_INSERT_TAIL(&head, pkg, entry);
+ 
			db->count++;

		}

		else

			free(pkg);
@@ -329,5 +338,16 @@ pkgdb_cache_init(struct pkgdb *db, const char *pattern)
		free(name);

	}
+ 
	/* sort packages */
+ 
	pkgs = calloc(db->count, sizeof(struct pkg));
+ 
	i = 0;
+ 
	TAILQ_FOREACH(pkg, &head, entry)
+ 
		pkgs[i++] = pkg;
+
+ 
	qsort(pkgs, db->count, sizeof(*pkgs), pkg_cmp);
+
+ 
	for (i = 0; i < (int)db->count; i++)
+ 
		TAILQ_INSERT_TAIL(&db->pkgs, pkgs[i], entry);
+ 


	return;

}