razor: razor.c@89c06e68824a (annotated)

krh@15	1	#define _GNU_SOURCE
krh@15	2
krh@0	3	#include <stdlib.h>
krh@19	4	#include <stddef.h>
krh@0	5	#include <stdio.h>
krh@0	6	#include <string.h>
krh@0	7	#include <sys/types.h>
krh@0	8	#include <sys/stat.h>
krh@0	9	#include <sys/mman.h>
krh@0	10	#include <unistd.h>
krh@0	11	#include <fcntl.h>
krh@15	12	#include <errno.h>
krh@35	13	#include <ctype.h>
krh@54	14	#include <fnmatch.h>
krh@0	15
krh@27	16	#include "razor.h"
krh@6	17
krh@30	18	struct array {
krh@30	19	void *data;
krh@30	20	int size, alloc;
krh@30	21	};
krh@30	22
krh@30	23	struct razor_set_section {
krh@30	24	unsigned int type;
krh@30	25	unsigned int offset;
krh@30	26	unsigned int size;
krh@30	27	};
krh@30	28
krh@30	29	struct razor_set_header {
krh@30	30	unsigned int magic;
krh@30	31	unsigned int version;
krh@30	32	struct razor_set_section sections[0];
krh@30	33	};
krh@30	34
krh@30	35	#define RAZOR_MAGIC 0x7a7a7a7a
krh@30	36	#define RAZOR_VERSION 1
krh@30	37
krh@61	38	#define RAZOR_ENTRY_LAST 0x80000000ul
krh@61	39	#define RAZOR_IMMEDIATE 0x80000000ul
krh@61	40	#define RAZOR_ENTRY_MASK 0x00fffffful
krh@61	41
krh@66	42	#define RAZOR_STRING_POOL 0
krh@66	43	#define RAZOR_PACKAGES 1
krh@66	44	#define RAZOR_PROPERTIES 2
krh@66	45	#define RAZOR_FILES 3
krh@66	46	#define RAZOR_PACKAGE_POOL 4
krh@66	47	#define RAZOR_PROPERTY_POOL 5
krh@66	48	#define RAZOR_FILE_POOL 6
krh@30	49
krh@30	50	struct razor_package {
krh@30	51	unsigned long name;
krh@30	52	unsigned long version;
krh@66	53	unsigned long properties;
krh@56	54	unsigned long files;
krh@30	55	};
krh@30	56
krh@30	57	struct razor_property {
krh@30	58	unsigned long name;
krh@30	59	unsigned long version;
krh@30	60	unsigned long packages;
krh@30	61	};
krh@30	62
krh@48	63	struct razor_entry {
krh@48	64	unsigned long name;
krh@48	65	unsigned long start;
krh@52	66	unsigned long packages;
krh@48	67	};
krh@48	68
krh@30	69	struct razor_set {
krh@30	70	struct array string_pool;
krh@30	71	struct array packages;
krh@66	72	struct array properties;
krh@56	73	struct array files;
krh@56	74	struct array package_pool;
krh@66	75	struct array property_pool;
krh@56	76	struct array file_pool;
krh@30	77	struct razor_set_header *header;
krh@30	78	};
krh@30	79
krh@52	80	struct import_entry {
krh@52	81	unsigned long package;
krh@52	82	char *name;
krh@52	83	};
krh@52	84
krh@52	85	struct import_directory {
krh@52	86	unsigned long name, count;
krh@52	87	struct array files;
krh@52	88	struct array packages;
krh@52	89	struct import_directory *last;
krh@52	90	};
krh@52	91
krh@78	92	struct hashtable {
krh@78	93	struct array buckets;
krh@78	94	struct array *pool;
krh@78	95	};
krh@78	96
krh@30	97	struct razor_importer {
krh@30	98	struct razor_set *set;
krh@78	99	struct hashtable table;
krh@30	100	struct razor_package *package;
krh@66	101	struct array properties;
krh@48	102	struct array files;
krh@30	103	};
krh@30	104
krh@13	105	static void
krh@13	106	array_init(struct array *array)
krh@13	107	{
krh@13	108	memset(array, 0, sizeof *array);
krh@13	109	}
krh@13	110
krh@13	111	static void
krh@13	112	array_release(struct array *array)
krh@13	113	{
krh@13	114	free(array->data);
krh@13	115	}
krh@13	116
krh@6	117	static void *
krh@6	118	array_add(struct array *array, int size)
krh@6	119	{
krh@6	120	int alloc;
krh@6	121	void data, p;
krh@6	122
krh@6	123	if (array->alloc > 0)
krh@6	124	alloc = array->alloc;
krh@6	125	else
krh@10	126	alloc = 16;
krh@6	127
krh@6	128	while (alloc < array->size + size)
krh@6	129	alloc *= 2;
krh@6	130
krh@6	131	if (array->alloc < alloc) {
krh@6	132	data = realloc(array->data, alloc);
krh@6	133	if (data == NULL)
krh@6	134	return 0;
krh@6	135	array->data = data;
krh@6	136	array->alloc = alloc;
krh@6	137	}
krh@6	138
krh@6	139	p = array->data + array->size;
krh@6	140	array->size += size;
krh@6	141
krh@6	142	return p;
krh@6	143	}
krh@6	144
krh@0	145	static int
krh@0	146	write_to_fd(int fd, void *p, size_t size)
krh@0	147	{
krh@0	148	int rest, len;
krh@0	149
krh@0	150	rest = size;
krh@0	151	while (rest > 0) {
krh@0	152	len = write(fd, p, rest);
krh@0	153	if (len < 0)
krh@0	154	return -1;
krh@0	155	rest -= len;
krh@0	156	}
krh@0	157
krh@0	158	return 0;
krh@0	159	}
krh@0	160
krh@0	161	static void *
krh@0	162	zalloc(size_t size)
krh@0	163	{
krh@0	164	void *p;
krh@0	165
krh@0	166	p = malloc(size);
krh@0	167	memset(p, 0, size);
krh@0	168
krh@0	169	return p;
krh@0	170	}
krh@0	171
krh@19	172	struct razor_set_section razor_sections[] = {
krh@56	173	{ RAZOR_STRING_POOL, offsetof(struct razor_set, string_pool) },
krh@19	174	{ RAZOR_PACKAGES, offsetof(struct razor_set, packages) },
krh@66	175	{ RAZOR_PROPERTIES, offsetof(struct razor_set, properties) },
krh@56	176	{ RAZOR_FILES, offsetof(struct razor_set, files) },
krh@39	177	{ RAZOR_PACKAGE_POOL, offsetof(struct razor_set, package_pool) },
krh@66	178	{ RAZOR_PROPERTY_POOL, offsetof(struct razor_set, property_pool) },
krh@56	179	{ RAZOR_FILE_POOL, offsetof(struct razor_set, file_pool) },
krh@19	180	};
krh@19	181
krh@4	182	struct razor_set *
krh@4	183	razor_set_create(void)
krh@0	184	{
krh@18	185	return zalloc(sizeof(struct razor_set));
krh@0	186	}
krh@0	187
krh@4	188	struct razor_set *
krh@4	189	razor_set_open(const char *filename)
krh@0	190	{
krh@4	191	struct razor_set *set;
krh@19	192	struct razor_set_section *s;
krh@0	193	struct stat stat;
krh@19	194	struct array *array;
krh@19	195	int fd;
krh@0	196
krh@4	197	set = zalloc(sizeof *set);
krh@0	198	fd = open(filename, O_RDONLY);
krh@0	199	if (fstat(fd, &stat) < 0)
krh@0	200	return NULL;
krh@4	201	set->header = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
krh@4	202	if (set->header == MAP_FAILED) {
krh@4	203	free(set);
krh@0	204	return NULL;
krh@0	205	}
krh@0	206
krh@19	207	for (s = set->header->sections; ~s->type; s++) {
krh@19	208	if (s->type >= ARRAY_SIZE(razor_sections))
krh@19	209	continue;
krh@19	210	if (s->type != razor_sections[s->type].type)
krh@19	211	continue;
krh@19	212	array = (void *) set + razor_sections[s->type].offset;
krh@19	213	array->data = (void *) set->header + s->offset;
krh@19	214	array->size = s->size;
krh@19	215	array->alloc = s->size;
krh@0	216	}
krh@0	217	close(fd);
krh@0	218
krh@4	219	return set;
krh@0	220	}
krh@0	221
krh@0	222	void
krh@4	223	razor_set_destroy(struct razor_set *set)
krh@0	224	{
krh@0	225	unsigned int size;
krh@19	226	struct array *a;
krh@0	227	int i;
krh@0	228
krh@4	229	if (set->header) {
krh@4	230	for (i = 0; set->header->sections[i].type; i++)
krh@0	231	;
krh@4	232	size = set->header->sections[i].type;
krh@4	233	munmap(set->header, size);
krh@0	234	} else {
krh@19	235	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
krh@19	236	a = (void *) set + razor_sections[i].offset;
krh@19	237	free(a->data);
krh@19	238	}
krh@0	239	}
krh@0	240
krh@4	241	free(set);
krh@0	242	}
krh@0	243
krh@43	244	int
krh@4	245	razor_set_write(struct razor_set set, const char filename)
krh@0	246	{
krh@0	247	char data[4096];
krh@4	248	struct razor_set_header header = (struct razor_set_header ) data;
krh@19	249	struct array *a;
krh@17	250	unsigned long offset;
krh@17	251	int i, fd;
krh@0	252
krh@0	253	memset(data, 0, sizeof data);
krh@4	254	header->magic = RAZOR_MAGIC;
krh@4	255	header->version = RAZOR_VERSION;
krh@17	256	offset = sizeof data;
krh@0	257
krh@19	258	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
krh@19	259	if (razor_sections[i].type != i)
krh@19	260	continue;
krh@19	261	a = (void *) set + razor_sections[i].offset;
krh@19	262	header->sections[i].type = i;
krh@17	263	header->sections[i].offset = offset;
krh@19	264	header->sections[i].size = a->size;
krh@19	265	offset += (a->size + 4095) & ~4095;
krh@17	266	}
krh@0	267
krh@19	268	header->sections[i].type = ~0;
krh@17	269	header->sections[i].offset = 0;
krh@17	270	header->sections[i].size = 0;
krh@10	271
krh@0	272	fd = open(filename, O_CREAT \| O_WRONLY \| O_TRUNC, 0666);
krh@0	273	if (fd < 0)
krh@0	274	return -1;
krh@0	275
krh@0	276	write_to_fd(fd, data, sizeof data);
krh@19	277	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
krh@19	278	if (razor_sections[i].type != i)
krh@19	279	continue;
krh@19	280	a = (void *) set + razor_sections[i].offset;
krh@19	281	write_to_fd(fd, a->data, (a->size + 4095) & ~4095);
krh@19	282	}
krh@17	283
krh@17	284	close(fd);
krh@0	285
krh@0	286	return 0;
krh@0	287	}
krh@0	288
krh@0	289	static unsigned int
krh@0	290	hash_string(const char *key)
krh@0	291	{
krh@0	292	const char *p;
krh@0	293	unsigned int hash = 0;
krh@0	294
krh@0	295	for (p = key; *p; p++)
krh@9	296	hash = (hash * 617) ^ *p;
krh@0	297
krh@0	298	return hash;
krh@0	299	}
krh@0	300
krh@32	301	static unsigned long
krh@78	302	hashtable_lookup(struct hashtable table, const char key)
krh@0	303	{
krh@6	304	unsigned int mask, start, i;
krh@6	305	unsigned long *b;
krh@6	306	char *pool;
krh@0	307
krh@78	308	pool = table->pool->data;
krh@78	309	mask = table->buckets.alloc - 1;
krh@6	310	start = hash_string(key) * sizeof(unsigned long);
krh@0	311
krh@78	312	for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
krh@78	313	b = table->buckets.data + ((start + i) & mask);
krh@6	314
krh@6	315	if (*b == 0)
krh@0	316	return 0;
krh@0	317
krh@6	318	if (strcmp(key, &pool[*b]) == 0)
krh@6	319	return *b;
krh@6	320	}
krh@0	321
krh@0	322	return 0;
krh@0	323	}
krh@0	324
krh@0	325	static unsigned long
krh@78	326	add_to_string_pool(struct hashtable table, const char key)
krh@0	327	{
krh@6	328	int len;
krh@6	329	char *p;
krh@0	330
krh@0	331	len = strlen(key) + 1;
krh@78	332	p = array_add(table->pool, len);
krh@6	333	memcpy(p, key, len);
krh@0	334
krh@78	335	return p - (char *) table->pool->data;
krh@0	336	}
krh@0	337
krh@10	338	static unsigned long
krh@39	339	add_to_property_pool(struct array pool, struct array properties)
krh@10	340	{
krh@10	341	unsigned long *p;
krh@10	342
krh@39	343	p = array_add(pool, properties->size);
krh@10	344	memcpy(p, properties->data, properties->size);
krh@64	345	p[properties->size / sizeof *p - 1] \|= RAZOR_IMMEDIATE;
krh@10	346
krh@39	347	return p - (unsigned long *) pool->data;
krh@10	348	}
krh@10	349
krh@0	350	static void
krh@78	351	do_insert(struct hashtable *table, unsigned long value)
krh@0	352	{
krh@6	353	unsigned int mask, start, i;
krh@6	354	unsigned long *b;
krh@0	355	const char *key;
krh@0	356
krh@78	357	key = (char *) table->pool->data + value;
krh@78	358	mask = table->buckets.alloc - 1;
krh@6	359	start = hash_string(key) * sizeof(unsigned long);
krh@6	360
krh@78	361	for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
krh@78	362	b = table->buckets.data + ((start + i) & mask);
krh@6	363	if (*b == 0) {
krh@6	364	*b = value;
krh@0	365	break;
krh@0	366	}
krh@6	367	}
krh@0	368	}
krh@0	369
krh@32	370	static unsigned long
krh@78	371	hashtable_insert(struct hashtable table, const char key)
krh@0	372	{
krh@6	373	unsigned long value, buckets, b, *end;
krh@6	374	int alloc;
krh@0	375
krh@78	376	alloc = table->buckets.alloc;
krh@78	377	array_add(&table->buckets, 4 * sizeof *buckets);
krh@78	378	if (alloc != table->buckets.alloc) {
krh@78	379	end = table->buckets.data + alloc;
krh@78	380	memset(end, 0, table->buckets.alloc - alloc);
krh@78	381	for (b = table->buckets.data; b < end; b++) {
krh@6	382	value = *b;
krh@6	383	if (value != 0) {
krh@6	384	*b = 0;
krh@78	385	do_insert(table, value);
krh@6	386	}
krh@0	387	}
krh@0	388	}
krh@0	389
krh@78	390	value = add_to_string_pool(table, key);
krh@78	391	do_insert (table, value);
krh@0	392
krh@0	393	return value;
krh@0	394	}
krh@0	395
krh@78	396	static void
krh@78	397	hashtable_init(struct hashtable table, struct array pool)
krh@78	398	{
krh@78	399	array_init(&table->buckets);
krh@78	400	table->pool = pool;
krh@78	401	}
krh@78	402
krh@78	403	static void
krh@78	404	hashtable_release(struct hashtable *table)
krh@78	405	{
krh@78	406	array_release(&table->buckets);
krh@78	407	}
krh@78	408
krh@30	409	static unsigned long
krh@32	410	razor_importer_tokenize(struct razor_importer importer, const char string)
krh@0	411	{
krh@0	412	unsigned long token;
krh@0	413
krh@13	414	if (string == NULL)
krh@78	415	string = "";
krh@13	416
krh@78	417	token = hashtable_lookup(&importer->table, string);
krh@0	418	if (token != 0)
krh@0	419	return token;
krh@0	420
krh@78	421	return hashtable_insert(&importer->table, string);
krh@0	422	}
krh@0	423
krh@27	424	void
krh@30	425	razor_importer_begin_package(struct razor_importer *importer,
krh@30	426	const char name, const char version)
krh@13	427	{
krh@25	428	struct razor_package *p;
krh@13	429
krh@30	430	p = array_add(&importer->set->packages, sizeof *p);
krh@32	431	p->name = razor_importer_tokenize(importer, name);
krh@32	432	p->version = razor_importer_tokenize(importer, version);
krh@13	433
krh@30	434	importer->package = p;
krh@66	435	array_init(&importer->properties);
krh@13	436	}
krh@13	437
krh@13	438	void
krh@30	439	razor_importer_finish_package(struct razor_importer *importer)
krh@13	440	{
krh@25	441	struct razor_package *p;
krh@13	442
krh@30	443	p = importer->package;
krh@66	444	p->properties = add_to_property_pool(&importer->set->property_pool,
krh@66	445	&importer->properties);
krh@13	446
krh@66	447	array_release(&importer->properties);
krh@13	448	}
krh@13	449
krh@66	450	void
krh@30	451	razor_importer_add_property(struct razor_importer *importer,
krh@66	452	const char name, const char version,
krh@66	453	enum razor_property_type type)
krh@13	454	{
krh@25	455	struct razor_property *p;
krh@13	456	unsigned long *r;
krh@13	457
krh@66	458	p = array_add(&importer->set->properties, sizeof *p);
krh@66	459	p->name = razor_importer_tokenize(importer, name) \| (type << 30);
krh@32	460	p->version = razor_importer_tokenize(importer, version);
krh@30	461	p->packages = importer->package -
krh@30	462	(struct razor_package *) importer->set->packages.data;
krh@13	463
krh@66	464	r = array_add(&importer->properties, sizeof *r);
krh@66	465	r = p - (struct razor_property ) importer->set->properties.data;
krh@30	466	}
krh@30	467
krh@46	468	void
krh@46	469	razor_importer_add_file(struct razor_importer importer, const char name)
krh@46	470	{
krh@52	471	struct import_entry *e;
krh@48	472
krh@52	473	e = array_add(&importer->files, sizeof *e);
krh@52	474
krh@52	475	e->package = importer->package -
krh@52	476	(struct razor_package *) importer->set->packages.data;
krh@52	477	e->name = strdup(name);
krh@46	478	}
krh@46	479
krh@30	480	struct razor_importer *
krh@30	481	razor_importer_new(void)
krh@30	482	{
krh@30	483	struct razor_importer *importer;
krh@30	484
krh@30	485	importer = zalloc(sizeof *importer);
krh@30	486	importer->set = razor_set_create();
krh@78	487	hashtable_init(&importer->table, &importer->set->string_pool);
krh@30	488
krh@30	489	return importer;
krh@9	490	}
krh@9	491
krh@75	492	/* Destroy an importer without creating the set. */
krh@75	493	void
krh@75	494	razor_importer_destroy(struct razor_importer *importer)
krh@75	495	{
krh@75	496	/* FIXME: write this */
krh@75	497	}
krh@75	498
krh@75	499
krh@22	500	typedef int (compare_with_data_func_t)(const void p1,
krh@22	501	const void *p,
krh@22	502	void *data);
krh@22	503
krh@25	504	struct qsort_context {
krh@25	505	size_t size;
krh@25	506	compare_with_data_func_t compare;
krh@25	507	void *data;
krh@25	508	};
krh@25	509
krh@22	510	static void
krh@22	511	qsort_swap(void p1, void p2, size_t size)
krh@22	512	{
krh@22	513	char buffer[size];
krh@22	514
krh@22	515	memcpy(buffer, p1, size);
krh@22	516	memcpy(p1, p2, size);
krh@22	517	memcpy(p2, buffer, size);
krh@22	518	}
krh@22	519
krh@25	520	static void
krh@25	521	__qsort_with_data(void base, size_t nelem, unsigned long map,
krh@25	522	struct qsort_context *ctx)
krh@22	523	{
krh@22	524	void p, start, end, pivot;
krh@25	525	unsigned long mp, mstart, *mend, tmp;
krh@22	526	int left, right, result;
krh@25	527	size_t size = ctx->size;
krh@22	528
krh@22	529	p = base;
krh@22	530	start = base;
krh@22	531	end = base + nelem * size;
krh@25	532	mp = map;
krh@25	533	mstart = map;
krh@25	534	mend = map + nelem;
krh@22	535	pivot = base + (random() % nelem) * size;
krh@25	536
krh@22	537	while (p < end) {
krh@25	538	result = ctx->compare(p, pivot, ctx->data);
krh@22	539	if (result < 0) {
krh@22	540	qsort_swap(p, start, size);
krh@25	541	tmp = *mp;
krh@25	542	mp = mstart;
krh@25	543	*mstart = tmp;
krh@22	544	if (start == pivot)
krh@22	545	pivot = p;
krh@22	546	start += size;
krh@25	547	mstart++;
krh@22	548	p += size;
krh@29	549	mp++;
krh@22	550	} else if (result == 0) {
krh@22	551	p += size;
krh@25	552	mp++;
krh@22	553	} else {
krh@22	554	end -= size;
krh@25	555	mend--;
krh@22	556	qsort_swap(p, end, size);
krh@25	557	tmp = *mp;
krh@29	558	mp = mend;
krh@29	559	*mend = tmp;
krh@22	560	if (end == pivot)
krh@22	561	pivot = p;
krh@22	562	}
krh@22	563	}
krh@22	564
krh@22	565	left = (start - base) / size;
krh@22	566	right = (base + nelem * size - end) / size;
krh@22	567	if (left > 1)
krh@25	568	__qsort_with_data(base, left, map, ctx);
krh@22	569	if (right > 1)
krh@25	570	__qsort_with_data(end, right, mend, ctx);
krh@25	571	}
krh@25	572
krh@25	573	unsigned long *
krh@25	574	qsort_with_data(void *base, size_t nelem, size_t size,
krh@25	575	compare_with_data_func_t compare, void *data)
krh@25	576	{
krh@25	577	struct qsort_context ctx;
krh@25	578	unsigned long *map;
krh@25	579	int i;
krh@25	580
krh@75	581	if (nelem == 0)
krh@75	582	return NULL;
krh@75	583
krh@25	584	ctx.size = size;
krh@25	585	ctx.compare = compare;
krh@25	586	ctx.data = data;
krh@25	587
krh@25	588	map = malloc(nelem * sizeof (unsigned long));
krh@25	589	for (i = 0; i < nelem; i++)
krh@25	590	map[i] = i;
krh@25	591
krh@25	592	__qsort_with_data(base, nelem, map, &ctx);
krh@25	593
krh@25	594	return map;
krh@22	595	}
krh@9	596
krh@9	597	static int
krh@35	598	versioncmp(const char s1, const char s2)
krh@35	599	{
krh@35	600	const char p1, p2;
krh@35	601	long n1, n2;
krh@35	602	int res;
krh@35	603
krh@35	604	n1 = strtol(s1, (char **) &p1, 0);
krh@35	605	n2 = strtol(s2, (char **) &p2, 0);
krh@35	606
krh@35	607	/* Epoch; if one but not the other has an epoch set, default
krh@35	608	* the epoch-less version to 0. */
krh@35	609	res = (p1 == ':') - (p2 == ':');
krh@35	610	if (res < 0) {
krh@35	611	n1 = 0;
krh@35	612	p1 = s1;
krh@35	613	p2++;
krh@35	614	} else if (res > 0) {
krh@35	615	p1++;
krh@35	616	n2 = 0;
krh@35	617	p2 = s2;
krh@35	618	}
krh@35	619
krh@35	620	if (n1 != n2)
krh@35	621	return n1 - n2;
krh@35	622	while (p1 && p2) {
krh@35	623	if (p1 != p2)
krh@35	624	return p1 - p2;
krh@35	625	p1++;
krh@35	626	p2++;
krh@35	627	if (isdigit(p1) && isdigit(p2))
krh@35	628	return versioncmp(p1, p2);
krh@35	629	}
krh@35	630
krh@35	631	return p1 - p2;
krh@35	632	}
krh@35	633
krh@35	634
krh@35	635	static int
krh@22	636	compare_packages(const void p1, const void p2, void *data)
krh@9	637	{
krh@25	638	const struct razor_package pkg1 = p1, pkg2 = p2;
krh@22	639	struct razor_set *set = data;
krh@22	640	char *pool = set->string_pool.data;
krh@9	641
krh@23	642	if (pkg1->name == pkg2->name)
krh@35	643	return versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
krh@23	644	else
krh@23	645	return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
krh@9	646	}
krh@9	647
krh@9	648	static int
krh@22	649	compare_properties(const void p1, const void p2, void *data)
krh@9	650	{
krh@25	651	const struct razor_property prop1 = p1, prop2 = p2;
krh@22	652	struct razor_set *set = data;
krh@22	653	char *pool = set->string_pool.data;
krh@9	654
krh@23	655	if (prop1->name == prop2->name)
krh@66	656	return versioncmp(&pool[prop1->version],
krh@66	657	&pool[prop2->version]);
krh@66	658	else if ((prop1->name & RAZOR_ENTRY_MASK) == (prop2->name & RAZOR_ENTRY_MASK))
krh@66	659	return (prop1->name >> 30) - (prop2->name >> 30);
krh@12	660	else
krh@66	661	return strcmp(&pool[prop1->name & RAZOR_ENTRY_MASK],
krh@66	662	&pool[prop2->name & RAZOR_ENTRY_MASK]);
krh@9	663	}
krh@9	664
krh@10	665	static unsigned long *
krh@66	666	uniqueify_properties(struct razor_set *set)
krh@9	667	{
krh@25	668	struct razor_property rp, up, *rp_end;
krh@18	669	struct array pkgs, p;
krh@25	670	unsigned long map, rmap, *r;
krh@18	671	int i, count, unique;
krh@9	672
krh@66	673	count = set->properties.size / sizeof(struct razor_property);
krh@66	674	map = qsort_with_data(set->properties.data,
krh@25	675	count,
krh@25	676	sizeof(struct razor_property),
krh@25	677	compare_properties,
krh@25	678	set);
krh@9	679
krh@66	680	rp_end = set->properties.data + set->properties.size;
krh@25	681	rmap = malloc(count * sizeof *map);
krh@25	682	pkgs = zalloc(count * sizeof *pkgs);
krh@66	683	for (rp = set->properties.data, up = rp, i = 0; rp < rp_end; rp++, i++) {
krh@25	684	if (rp->name != up->name \|\| rp->version != up->version) {
krh@25	685	up++;
krh@25	686	up->name = rp->name;
krh@25	687	up->version = rp->version;
krh@10	688	}
krh@25	689
krh@66	690	unique = up - (struct razor_property *) set->properties.data;
krh@25	691	rmap[map[i]] = unique;
krh@25	692	r = array_add(&pkgs[unique], sizeof *r);
krh@25	693	*r = rp->packages;
krh@10	694	}
krh@25	695	free(map);
krh@9	696
krh@25	697	up++;
krh@66	698	set->properties.size = (void *) up - set->properties.data;
krh@25	699	rp_end = up;
krh@66	700	for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
krh@61	701	if (p->size / sizeof *r == 1) {
krh@61	702	r = p->data;
krh@61	703	rp->packages = *r \| RAZOR_IMMEDIATE;
krh@61	704	} else {
krh@61	705	rp->packages =
krh@61	706	add_to_property_pool(&set->package_pool, p);
krh@61	707	}
krh@25	708	array_release(p);
krh@18	709	}
krh@18	710
krh@18	711	free(pkgs);
krh@18	712
krh@25	713	return rmap;
krh@10	714	}
krh@10	715
krh@10	716	static void
krh@39	717	remap_links(struct array links, unsigned long map)
krh@10	718	{
krh@39	719	unsigned long p, end;
krh@10	720
krh@39	721	end = links->data + links->size;
krh@39	722	for (p = links->data; p < end; p++)
krh@64	723	p = map[p & RAZOR_ENTRY_MASK] \| (*p & ~RAZOR_ENTRY_MASK);
krh@9	724	}
krh@9	725
krh@48	726	static int
krh@48	727	compare_filenames(const void p1, const void p2, void *data)
krh@48	728	{
krh@52	729	const struct import_entry *e1 = p1;
krh@52	730	const struct import_entry *e2 = p2;
krh@48	731
krh@52	732	return strcmp(e1->name, e2->name);
krh@48	733	}
krh@48	734
krh@48	735	static void
krh@52	736	count_entries(struct import_directory *d)
krh@48	737	{
krh@52	738	struct import_directory p, end;
krh@48	739
krh@48	740	p = d->files.data;
krh@48	741	end = d->files.data + d->files.size;
krh@48	742	d->count = 0;
krh@48	743	while (p < end) {
krh@48	744	count_entries(p);
krh@48	745	d->count += p->count + 1;
krh@48	746	p++;
krh@48	747	}
krh@48	748	}
krh@48	749
krh@48	750	static void
krh@52	751	serialize_files(struct razor_set *set,
krh@52	752	struct import_directory d, struct array array)
krh@48	753	{
krh@52	754	struct import_directory p, end;
krh@56	755	struct razor_entry *e = NULL;
krh@60	756	unsigned long s, *r;
krh@48	757
krh@48	758	p = d->files.data;
krh@48	759	end = d->files.data + d->files.size;
krh@48	760	s = array->size / sizeof e + d->files.size / sizeof p;
krh@48	761	while (p < end) {
krh@48	762	e = array_add(array, sizeof *e);
krh@48	763	e->name = p->name;
krh@56	764	e->start = p->count > 0 ? s : 0;
krh@48	765	s += p->count;
krh@60	766
krh@64	767	if (p->packages.size == 0) {
krh@64	768	/* FIXME: We need to make sure this is handled
krh@64	769	* correctly as the empty list. */
krh@64	770	e->packages = 0 \| RAZOR_IMMEDIATE;
krh@64	771	} else if (p->packages.size / sizeof *r == 1) {
krh@60	772	r = p->packages.data;
krh@60	773	e->packages = *r \| RAZOR_IMMEDIATE;
krh@60	774	} else {
krh@60	775	e->packages = add_to_property_pool(&set->package_pool,
krh@60	776	&p->packages);
krh@60	777	}
krh@52	778	array_release(&p->packages);
krh@48	779	p++;
krh@48	780	}
krh@56	781	if (e != NULL)
krh@56	782	e->name \|= RAZOR_ENTRY_LAST;
krh@48	783
krh@48	784	p = d->files.data;
krh@48	785	end = d->files.data + d->files.size;
krh@48	786	while (p < end) {
krh@52	787	serialize_files(set, p, array);
krh@48	788	p++;
krh@48	789	}
krh@48	790	}
krh@48	791
krh@48	792	static void
krh@61	793	remap_property_package_links(struct array properties, unsigned long rmap)
krh@61	794	{
krh@61	795	struct razor_property p, end;
krh@61	796
krh@61	797	end = properties->data + properties->size;
krh@61	798	for (p = properties->data; p < end; p++)
krh@61	799	if (p->packages & RAZOR_IMMEDIATE)
krh@61	800	p->packages = rmap[p->packages & RAZOR_ENTRY_MASK] \|
krh@61	801	RAZOR_IMMEDIATE;
krh@61	802	}
krh@61	803
krh@61	804	static void
krh@48	805	build_file_tree(struct razor_importer *importer)
krh@48	806	{
krh@48	807	int count, i, length;
krh@52	808	struct import_entry *filenames;
krh@52	809	char f, end;
krh@52	810	unsigned long name, *r;
krh@48	811	char dirname[256];
krh@52	812	struct import_directory *d, root;
krh@48	813	struct razor_entry *e;
krh@48	814
krh@52	815	count = importer->files.size / sizeof (struct import_entry);
krh@48	816	qsort_with_data(importer->files.data,
krh@48	817	count,
krh@52	818	sizeof (struct import_entry),
krh@48	819	compare_filenames,
krh@48	820	NULL);
krh@48	821
krh@48	822	root.name = razor_importer_tokenize(importer, "");
krh@48	823	array_init(&root.files);
krh@52	824	array_init(&root.packages);
krh@48	825	root.last = NULL;
krh@48	826
krh@48	827	filenames = importer->files.data;
krh@48	828	for (i = 0; i < count; i++) {
krh@52	829	f = filenames[i].name;
krh@48	830	if (*f != '/')
krh@48	831	continue;
krh@57	832	f++;
krh@48	833
krh@48	834	d = &root;
krh@48	835	while (*f) {
krh@57	836	end = strchr(f, '/');
krh@48	837	if (end == NULL)
krh@48	838	end = f + strlen(f);
krh@57	839	length = end - f;
krh@57	840	memcpy(dirname, f, length);
krh@48	841	dirname[length] ='\0';
krh@48	842	name = razor_importer_tokenize(importer, dirname);
krh@48	843	if (d->last == NULL \|\| d->last->name != name) {
krh@48	844	d->last = array_add(&d->files, sizeof *d);
krh@48	845	d->last->name = name;
krh@48	846	d->last->last = NULL;
krh@48	847	array_init(&d->last->files);
krh@52	848	array_init(&d->last->packages);
krh@48	849	}
krh@48	850	d = d->last;
krh@57	851	f = end + 1;
krh@57	852	if (*end == '\0')
krh@57	853	break;
krh@48	854	}
krh@48	855
krh@52	856	r = array_add(&d->packages, sizeof *r);
krh@52	857	*r = filenames[i].package;
krh@52	858	free(filenames[i].name);
krh@48	859	}
krh@48	860
krh@48	861	count_entries(&root);
krh@56	862	array_init(&importer->set->files);
krh@48	863
krh@56	864	e = array_add(&importer->set->files, sizeof *e);
krh@56	865	e->name = root.name \| RAZOR_ENTRY_LAST;
krh@48	866	e->start = 1;
krh@56	867	e->packages = 0;
krh@48	868
krh@56	869	serialize_files(importer->set, &root, &importer->set->files);
krh@48	870
krh@48	871	array_release(&importer->files);
krh@48	872	}
krh@48	873
krh@56	874	static void
krh@60	875	build_package_file_lists(struct razor_set set, unsigned long rmap)
krh@54	876	{
krh@56	877	struct razor_package p, packages;
krh@56	878	struct array *pkgs;
krh@54	879	struct razor_entry e, end;
krh@56	880	unsigned long r, q;
krh@56	881	int i, count;
krh@54	882
krh@56	883	count = set->packages.size / sizeof *p;
krh@56	884	pkgs = zalloc(count * sizeof *pkgs);
krh@54	885
krh@56	886	e = set->files.data;
krh@56	887	end = set->files.data + set->files.size;
krh@54	888	while (e < end) {
krh@60	889	if (e->packages & RAZOR_IMMEDIATE) {
krh@60	890	e->packages = rmap[e->packages & RAZOR_ENTRY_MASK] \|
krh@60	891	RAZOR_IMMEDIATE;
krh@60	892	r = &e->packages;
krh@60	893	} else {
krh@60	894	r = (unsigned long *) set->package_pool.data + e->packages;
krh@60	895	}
krh@60	896
krh@64	897	while (1) {
krh@60	898	q = array_add(&pkgs[r & RAZOR_ENTRY_MASK], sizeof q);
krh@56	899	q = e - (struct razor_entry ) set->files.data;
krh@60	900	if (*r++ & RAZOR_IMMEDIATE)
krh@60	901	break;
krh@54	902	}
krh@54	903	e++;
krh@54	904	}
krh@54	905
krh@56	906	packages = set->packages.data;
krh@56	907	for (i = 0; i < count; i++) {
krh@56	908	packages[i].files =
krh@56	909	add_to_property_pool(&set->file_pool, &pkgs[i]);
krh@56	910	array_release(&pkgs[i]);
krh@48	911	}
krh@56	912	free(pkgs);
krh@52	913	}
krh@52	914
krh@27	915	struct razor_set *
krh@30	916	razor_importer_finish(struct razor_importer *importer)
krh@9	917	{
krh@30	918	struct razor_set *set;
krh@39	919	unsigned long map, rmap;
krh@39	920	int i, count;
krh@18	921
krh@66	922	map = uniqueify_properties(importer->set);
krh@66	923	remap_links(&importer->set->property_pool, map);
krh@39	924	free(map);
krh@25	925
krh@30	926	count = importer->set->packages.size / sizeof(struct razor_package);
krh@30	927	map = qsort_with_data(importer->set->packages.data,
krh@25	928	count,
krh@25	929	sizeof(struct razor_package),
krh@25	930	compare_packages,
krh@30	931	importer->set);
krh@39	932
krh@39	933	rmap = malloc(count * sizeof *rmap);
krh@39	934	for (i = 0; i < count; i++)
krh@39	935	rmap[map[i]] = i;
krh@25	936	free(map);
krh@13	937
krh@48	938	build_file_tree(importer);
krh@52	939	remap_links(&importer->set->package_pool, rmap);
krh@60	940	build_package_file_lists(importer->set, rmap);
krh@66	941	remap_property_package_links(&importer->set->properties, rmap);
krh@52	942	free(rmap);
krh@48	943
krh@30	944	set = importer->set;
krh@78	945	hashtable_release(&importer->table);
krh@30	946	free(importer);
krh@30	947
krh@30	948	return set;
krh@9	949	}
krh@9	950
krh@0	951	void
krh@54	952	razor_set_list(struct razor_set set, const char pattern)
krh@3	953	{
krh@6	954	struct razor_package p, end;
krh@54	955	int with_version = 0;
krh@6	956	char *pool;
krh@3	957
krh@6	958	pool = set->string_pool.data;
krh@6	959	end = set->packages.data + set->packages.size;
krh@54	960	for (p = set->packages.data; p < end; p++) {
krh@54	961	if (pattern && fnmatch(pattern, &pool[p->name], 0) != 0)
krh@54	962	continue;
krh@54	963	if (with_version)
krh@59	964	printf("%s-%s\n", &pool[p->name], &pool[p->version]);
krh@54	965	else
krh@54	966	printf("%s\n", &pool[p->name]);
krh@54	967	}
krh@3	968	}
krh@3	969
krh@16	970	struct razor_set *bsearch_set;
krh@16	971
krh@16	972	static int
krh@16	973	compare_package_name(const void key, const void data)
krh@16	974	{
krh@16	975	const struct razor_package *p = data;
krh@16	976	char *pool;
krh@16	977
krh@16	978	pool = bsearch_set->string_pool.data;
krh@16	979
krh@16	980	return strcmp(key, &pool[p->name]);
krh@16	981	}
krh@16	982
krh@10	983	struct razor_package *
krh@10	984	razor_set_get_package(struct razor_set set, const char package)
krh@10	985	{
krh@16	986	bsearch_set = set;
krh@16	987	return bsearch(package, set->packages.data,
krh@16	988	set->packages.size / sizeof(struct razor_package),
krh@16	989	sizeof(struct razor_package), compare_package_name);
krh@10	990	}
krh@10	991
krh@18	992	static int
krh@18	993	compare_property_name(const void key, const void data)
krh@18	994	{
krh@18	995	const struct razor_property *p = data;
krh@18	996	char *pool;
krh@18	997
krh@18	998	pool = bsearch_set->string_pool.data;
krh@18	999
krh@66	1000	return strcmp(key, &pool[p->name & RAZOR_ENTRY_MASK]);
krh@18	1001	}
krh@18	1002
krh@18	1003	struct razor_property *
krh@66	1004	razor_set_get_property(struct razor_set set, const char property)
krh@18	1005	{
krh@18	1006	struct razor_property p, start;
krh@18	1007
krh@18	1008	bsearch_set = set;
krh@66	1009	p = bsearch(property, set->properties.data,
krh@66	1010	set->properties.size / sizeof(struct razor_property),
krh@18	1011	sizeof(struct razor_property), compare_property_name);
krh@18	1012
krh@66	1013	start = set->properties.data;
krh@66	1014	while (p > start &&
krh@66	1015	((p - 1)->name & RAZOR_ENTRY_MASK) ==
krh@66	1016	(p->name & RAZOR_ENTRY_MASK))
krh@18	1017	p--;
krh@18	1018
krh@18	1019	return p;
krh@18	1020	}
krh@18	1021
krh@66	1022	void
krh@66	1023	razor_set_list_properties(struct razor_set set, const char name,
krh@66	1024	enum razor_property_type type)
krh@8	1025	{
krh@66	1026	struct razor_property p, properties, *end;
krh@10	1027	struct razor_package *package;
krh@10	1028	unsigned long *r;
krh@7	1029	char *pool;
krh@7	1030
krh@66	1031	pool = set->string_pool.data;
krh@66	1032
krh@10	1033	if (name) {
krh@10	1034	package = razor_set_get_package(set, name);
krh@66	1035	r = (unsigned long *) set->property_pool.data +
krh@66	1036	package->properties;
krh@66	1037	properties = set->properties.data;
krh@64	1038	while (1) {
krh@66	1039	p = &properties[*r & RAZOR_ENTRY_MASK];
krh@66	1040	if ((p->name >> 30) != type)
krh@66	1041	goto next;
krh@66	1042	if (pool[p->version] == '\0')
krh@66	1043	printf("%s\n",
krh@66	1044	&pool[p->name & RAZOR_ENTRY_MASK]);
krh@66	1045	else
krh@66	1046	printf("%s-%s\n",
krh@66	1047	&pool[p->name & RAZOR_ENTRY_MASK],
krh@66	1048	&pool[p->version]);
krh@66	1049	next:
krh@64	1050	if (*r++ & RAZOR_IMMEDIATE)
krh@64	1051	break;
krh@10	1052	}
krh@66	1053	} else {
krh@66	1054	end = set->properties.data + set->properties.size;
krh@66	1055	for (p = set->properties.data; p < end; p++) {
krh@66	1056	if ((p->name >> 30) != type)
krh@66	1057	continue;
krh@66	1058	if (pool[p->version] == '\0')
krh@66	1059	printf("%s\n",
krh@66	1060	&pool[p->name & RAZOR_ENTRY_MASK]);
krh@66	1061	else
krh@66	1062	printf("%s-%s\n",
krh@66	1063	&pool[p->name & RAZOR_ENTRY_MASK],
krh@66	1064	&pool[p->version]);
krh@66	1065	}
krh@66	1066	}
krh@10	1067	}
krh@10	1068
krh@10	1069	void
krh@18	1070	razor_set_list_property_packages(struct razor_set *set,
krh@20	1071	const char *name,
krh@66	1072	const char *version,
krh@66	1073	enum razor_property_type type)
krh@18	1074	{
krh@18	1075	struct razor_property property, end;
krh@18	1076	struct razor_package p, packages;
krh@18	1077	unsigned long *r;
krh@18	1078	char *pool;
krh@18	1079
krh@18	1080	if (name == NULL)
krh@18	1081	return;
krh@18	1082
krh@66	1083	property = razor_set_get_property(set, name);
krh@18	1084	packages = set->packages.data;
krh@18	1085	pool = set->string_pool.data;
krh@66	1086	end = set->properties.data + set->properties.size;
krh@66	1087	while (property < end &&
krh@66	1088	strcmp(name, &pool[property->name & RAZOR_ENTRY_MASK]) == 0) {
krh@66	1089	if (version &&
krh@66	1090	versioncmp(version, &pool[property->version]) != 0)
krh@66	1091	goto next;
krh@66	1092	if (type != (property->name >> 30))
krh@20	1093	goto next;
krh@61	1094
krh@61	1095	if (property->packages & RAZOR_IMMEDIATE)
krh@61	1096	r = &property->packages;
krh@61	1097	else
krh@61	1098	r = (unsigned long *)
krh@61	1099	set->package_pool.data + property->packages;
krh@64	1100	while (1) {
krh@61	1101	p = &packages[*r & RAZOR_ENTRY_MASK];
krh@66	1102	printf("%s-%s\n",
krh@66	1103	&pool[p->name & RAZOR_ENTRY_MASK],
krh@66	1104	&pool[p->version]);
krh@61	1105	if (*r++ & RAZOR_IMMEDIATE)
krh@61	1106	break;
krh@18	1107	}
krh@20	1108	next:
krh@18	1109	property++;
krh@18	1110	}
krh@18	1111	}
krh@18	1112
krh@56	1113	static struct razor_entry *
krh@56	1114	find_entry(struct razor_set set, struct razor_entry dir, const char *pattern)
krh@56	1115	{
krh@56	1116	struct razor_entry *e;
krh@56	1117	const char n, pool = set->string_pool.data;
krh@56	1118	int len;
krh@56	1119
krh@56	1120	e = (struct razor_entry *) set->files.data + dir->start;
krh@56	1121	do {
krh@56	1122	n = pool + (e->name & RAZOR_ENTRY_MASK);
krh@56	1123	if (strcmp(pattern + 1, n) == 0)
krh@56	1124	return e;
krh@57	1125	len = strlen(n);
krh@56	1126	if (e->start != 0 && strncmp(pattern + 1, n, len) == 0 &&
krh@56	1127	pattern[len + 1] == '/') {
krh@56	1128	return find_entry(set, e, pattern + len + 1);
krh@56	1129	}
krh@56	1130	} while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
krh@56	1131
krh@56	1132	return NULL;
krh@56	1133	}
krh@56	1134
krh@56	1135	static void
krh@56	1136	list_dir(struct razor_set set, struct razor_entry dir,
krh@56	1137	const char prefix, const char pattern)
krh@56	1138	{
krh@56	1139	struct razor_entry *e;
krh@56	1140	const char n, pool = set->string_pool.data;
krh@56	1141
krh@56	1142	e = (struct razor_entry *) set->files.data + dir->start;
krh@56	1143	do {
krh@56	1144	n = pool + (e->name & RAZOR_ENTRY_MASK);
krh@56	1145	if (pattern && pattern[0] && fnmatch(pattern, n, 0) != 0)
krh@56	1146	continue;
krh@56	1147	printf("%s/%s%s\n", prefix, n, e->start > 0 ? "/" : "");
krh@56	1148	} while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
krh@56	1149	}
krh@56	1150
krh@56	1151	void
krh@56	1152	razor_set_list_files(struct razor_set set, const char pattern)
krh@56	1153	{
krh@56	1154	struct razor_entry *e;
krh@56	1155	char buffer[512], p, base;
krh@56	1156
krh@56	1157	if (pattern == NULL)
krh@56	1158	pattern = "/";
krh@56	1159
krh@56	1160	strcpy(buffer, pattern);
krh@56	1161	e = find_entry(set, set->files.data, buffer);
krh@56	1162	if (e && e->start > 0) {
krh@56	1163	base = NULL;
krh@56	1164	} else {
krh@56	1165	p = strrchr(buffer, '/');
krh@56	1166	if (p) {
krh@56	1167	*p = '\0';
krh@56	1168	base = p + 1;
krh@56	1169	} else {
krh@56	1170	base = NULL;
krh@56	1171	}
krh@56	1172	}
krh@56	1173	e = find_entry(set, set->files.data, buffer);
krh@56	1174	if (e->start != 0)
krh@56	1175	list_dir(set, e, buffer, base);
krh@56	1176	}
krh@56	1177
krh@56	1178	void
krh@56	1179	razor_set_list_file_packages(struct razor_set set, const char filename)
krh@56	1180	{
krh@56	1181	struct razor_entry *e;
krh@56	1182	struct razor_package packages, p;
krh@56	1183	const char *pool;
krh@56	1184	unsigned long *r;
krh@56	1185
krh@56	1186	e = find_entry(set, set->files.data, filename);
krh@56	1187	if (e == NULL)
krh@56	1188	return;
krh@56	1189
krh@60	1190	if (e->packages & RAZOR_IMMEDIATE)
krh@60	1191	r = &e->packages;
krh@60	1192	else
krh@60	1193	r = (unsigned long *) set->package_pool.data + e->packages;
krh@60	1194
krh@56	1195	packages = set->packages.data;
krh@56	1196	pool = set->string_pool.data;
krh@64	1197	while (1) {
krh@60	1198	p = &packages[*r & RAZOR_ENTRY_MASK];
krh@59	1199	printf("%s-%s\n", &pool[p->name], &pool[p->version]);
krh@60	1200	if (*r++ & RAZOR_IMMEDIATE)
krh@60	1201	break;
krh@56	1202	}
krh@56	1203	}
krh@56	1204
krh@56	1205	static unsigned long *
krh@56	1206	list_package_files(struct razor_set set, unsigned long r,
krh@56	1207	struct razor_entry *dir, unsigned long end,
krh@56	1208	char *prefix)
krh@56	1209	{
krh@56	1210	struct razor_entry e, f, *entries;
krh@56	1211	unsigned long next;
krh@56	1212	char *pool;
krh@56	1213	int len;
krh@56	1214
krh@56	1215	entries = (struct razor_entry *) set->files.data;
krh@56	1216	pool = set->string_pool.data;
krh@56	1217
krh@56	1218	e = entries + dir->start;
krh@56	1219	do {
krh@56	1220	if (entries + *r == e) {
krh@56	1221	printf("%s/%s\n", prefix,
krh@56	1222	pool + (e->name & RAZOR_ENTRY_MASK));
krh@56	1223	r++;
krh@56	1224	if (*r >= end)
krh@56	1225	break;
krh@56	1226	}
krh@56	1227	} while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
krh@56	1228
krh@56	1229	e = entries + dir->start;
krh@56	1230	do {
krh@56	1231	if (e->start == 0)
krh@56	1232	continue;
krh@56	1233
krh@56	1234	if (e->name & RAZOR_ENTRY_LAST)
krh@56	1235	next = end;
krh@56	1236	else {
krh@56	1237	f = e + 1;
krh@56	1238	while (f->start == 0 && !(f->name & RAZOR_ENTRY_LAST))
krh@56	1239	f++;
krh@56	1240	if (f->start == 0)
krh@56	1241	next = end;
krh@56	1242	else
krh@56	1243	next = f->start;
krh@56	1244	}
krh@56	1245
krh@56	1246	if (e->start <= r && r < next) {
krh@56	1247	len = strlen(prefix);
krh@56	1248	prefix[len] = '/';
krh@56	1249	strcpy(prefix + len + 1,
krh@56	1250	pool + (e->name & RAZOR_ENTRY_MASK));
krh@56	1251	r = list_package_files(set, r, e, next, prefix);
krh@56	1252	prefix[len] = '\0';
krh@56	1253	if (*r >= end)
krh@56	1254	break;
krh@56	1255	}
krh@56	1256	} while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
krh@56	1257
krh@56	1258	return r;
krh@56	1259	}
krh@56	1260
krh@56	1261	void
krh@56	1262	razor_set_list_package_files(struct razor_set set, const char name)
krh@56	1263	{
krh@56	1264	struct razor_package *package;
krh@56	1265	unsigned long *r, end;
krh@56	1266	char buffer[512];
krh@56	1267
krh@56	1268	package = razor_set_get_package(set, name);
krh@56	1269
krh@56	1270	r = (unsigned long *) set->file_pool.data + package->files;
krh@56	1271	end = set->files.size / sizeof (struct razor_entry);
krh@56	1272	buffer[0] = '\0';
krh@56	1273	list_package_files(set, r, set->files.data, end, buffer);
krh@56	1274	}
krh@56	1275
krh@43	1276	static void
krh@21	1277	razor_set_validate(struct razor_set set, struct array unsatisfied)
krh@21	1278	{
krh@66	1279	struct razor_property r, p, *end;
krh@21	1280	unsigned long *u;
krh@21	1281	char *pool;
krh@21	1282
krh@66	1283	end = set->properties.data + set->properties.size;
krh@21	1284	pool = set->string_pool.data;
krh@21	1285
krh@66	1286	for (r = set->properties.data, p = r; r < end; r++) {
krh@66	1287	if (r->name >> 30 != RAZOR_PROPERTY_REQUIRES)
krh@66	1288	continue;
krh@66	1289
krh@66	1290	if ((r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK)) {
krh@66	1291	p = r;
krh@66	1292	while (p < end && p->name == r->name)
krh@66	1293	p++;
krh@66	1294	}
krh@37	1295
krh@35	1296	/* If there is more than one version of a provides,
krh@35	1297	* seek to the end for the highest version. */
krh@66	1298	/* FIXME: This doesn't work if we have a series of
krh@66	1299	* requires a = 1, provides a = 1, requires a = 2,
krh@66	1300	* provides a = 2, as the kernel and kernel-devel
krh@66	1301	* does.*/
krh@66	1302	while (p + 1 < end && p->name == (p + 1)->name)
krh@35	1303	p++;
krh@37	1304
krh@37	1305	/* FIXME: We need to track property flags (<, <=, =
krh@37	1306	* etc) to properly determine if a requires is
krh@37	1307	* satisfied. The current code doesn't track that the
krh@37	1308	* requires a = 1 isn't satisfied by a = 2 provides. */
krh@37	1309
krh@66	1310	if (p == end \|\|
krh@66	1311	(p->name >> 30) != RAZOR_PROPERTY_PROVIDES \|\|
krh@66	1312	(r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK) \|\|
krh@35	1313	versioncmp(&pool[r->version], &pool[p->version]) > 0) {
krh@35	1314	/* FIXME: We ignore file requires for now. */
krh@66	1315	if (pool[r->name & RAZOR_ENTRY_MASK] == '/')
krh@35	1316	continue;
krh@21	1317	u = array_add(unsatisfied, sizeof *u);
krh@66	1318	u = r - (struct razor_property ) set->properties.data;
krh@21	1319	}
krh@21	1320	}
krh@21	1321	}
krh@21	1322
krh@21	1323	void
krh@21	1324	razor_set_list_unsatisfied(struct razor_set *set)
krh@21	1325	{
krh@21	1326	struct array unsatisfied;
krh@66	1327	struct razor_property properties, r;
krh@21	1328	unsigned long u, end;
krh@21	1329	char *pool;
krh@21	1330
krh@21	1331	array_init(&unsatisfied);
krh@21	1332	razor_set_validate(set, &unsatisfied);
krh@21	1333
krh@21	1334	end = unsatisfied.data + unsatisfied.size;
krh@66	1335	properties = set->properties.data;
krh@21	1336	pool = set->string_pool.data;
krh@21	1337
krh@21	1338	for (u = unsatisfied.data; u < end; u++) {
krh@66	1339	r = properties + *u;
krh@66	1340	if (pool[r->version] == '\0')
krh@66	1341	printf("%ss not satisfied\n",
krh@66	1342	&pool[r->name & RAZOR_ENTRY_MASK]);
krh@66	1343	else
krh@66	1344	printf("%s-%s not satisfied\n",
krh@66	1345	&pool[r->name & RAZOR_ENTRY_MASK],
krh@66	1346	&pool[r->version]);
krh@21	1347	}
krh@21	1348
krh@21	1349	array_release(&unsatisfied);
krh@21	1350	}
krh@21	1351
krh@41	1352	#define UPSTREAM_SOURCE 0x80000000ul
krh@41	1353	#define INDEX_MASK 0x00fffffful
krh@41	1354
krh@41	1355	struct source {
krh@41	1356	struct razor_set *set;
krh@66	1357	unsigned long *property_map;
krh@41	1358	};
krh@41	1359
krh@41	1360	static void
krh@41	1361	prepare_source(struct source source, struct razor_set set)
krh@41	1362	{
krh@41	1363	int count;
krh@41	1364	size_t size;
krh@41	1365
krh@41	1366	source->set = set;
krh@41	1367
krh@66	1368	count = set->properties.size / sizeof (struct razor_property);
krh@66	1369	size = count * sizeof *source->property_map;
krh@66	1370	source->property_map = zalloc(size);
krh@41	1371	}
krh@41	1372
krh@33	1373	static void
krh@33	1374	add_package(struct razor_importer *importer,
krh@41	1375	struct razor_package package, struct source source,
krh@41	1376	unsigned long flags)
krh@33	1377	{
krh@33	1378	char *pool;
krh@33	1379	unsigned long *r;
krh@41	1380	struct razor_package *p;
krh@33	1381
krh@41	1382	pool = source->set->string_pool.data;
krh@41	1383	p = array_add(&importer->set->packages, sizeof *p);
krh@41	1384	p->name = razor_importer_tokenize(importer, &pool[package->name]);
krh@41	1385	p->name \|= flags;
krh@41	1386	p->version = razor_importer_tokenize(importer,
krh@41	1387	&pool[package->version]);
krh@66	1388	p->properties = package->properties;
krh@33	1389
krh@66	1390	if (package->properties & RAZOR_IMMEDIATE)
krh@66	1391	r = &package->properties;
krh@64	1392	else
krh@64	1393	r = (unsigned long *)
krh@66	1394	source->set->property_pool.data + package->properties;
krh@64	1395	while (1) {
krh@66	1396	source->property_map[*r & RAZOR_ENTRY_MASK] = 1;
krh@64	1397	if (*r++ & RAZOR_IMMEDIATE)
krh@64	1398	break;
krh@64	1399	}
krh@41	1400	}
krh@41	1401
krh@41	1402
krh@41	1403	/* Build the new package list sorted by merging the two package lists.
krh@41	1404	* Build new string pool as we go. (for now we just re-use that part of
krh@41	1405	* the importer). */
krh@41	1406	static void
krh@41	1407	merge_packages(struct razor_importer *importer,
krh@41	1408	struct source source1, struct source source2,
krh@41	1409	struct array *packages)
krh@41	1410	{
krh@41	1411	struct razor_package upstream_packages, p, s, send;
krh@41	1412	char spool, upool;
krh@41	1413	unsigned long u, uend;
krh@41	1414	int cmp;
krh@41	1415
krh@41	1416	upstream_packages = source2->set->packages.data;
krh@41	1417
krh@41	1418	u = packages->data;
krh@41	1419	uend = packages->data + packages->size;
krh@41	1420	upool = source2->set->string_pool.data;
krh@41	1421
krh@41	1422	s = source1->set->packages.data;
krh@41	1423	send = source1->set->packages.data + source1->set->packages.size;
krh@41	1424	spool = source1->set->string_pool.data;
krh@41	1425
krh@41	1426	while (s < send) {
krh@41	1427	p = upstream_packages + *u;
krh@41	1428
krh@41	1429	if (u < uend)
krh@41	1430	cmp = strcmp(&spool[s->name], &upool[p->name]);
krh@41	1431	if (u >= uend \|\| cmp < 0) {
krh@41	1432	add_package(importer, s, source1, 0);
krh@41	1433	s++;
krh@41	1434	} else if (cmp == 0) {
krh@41	1435	add_package(importer, p, source2, UPSTREAM_SOURCE);
krh@41	1436	s++;
krh@41	1437	u++;
krh@41	1438	} else {
krh@41	1439	add_package(importer, p, source2, UPSTREAM_SOURCE);
krh@41	1440	u++;
krh@41	1441	}
krh@41	1442	}
krh@41	1443	}
krh@41	1444
krh@41	1445	static unsigned long
krh@66	1446	add_property(struct razor_importer *importer,
krh@69	1447	const char name, const char version, int type)
krh@41	1448	{
krh@41	1449	struct razor_property *p;
krh@41	1450
krh@66	1451	p = array_add(&importer->set->properties, sizeof *p);
krh@69	1452	p->name = razor_importer_tokenize(importer, name) \| (type << 30);
krh@41	1453	p->version = razor_importer_tokenize(importer, version);
krh@41	1454
krh@66	1455	return p - (struct razor_property *) importer->set->properties.data;
krh@41	1456	}
krh@41	1457
krh@41	1458	static void
krh@66	1459	merge_properties(struct razor_importer *importer,
krh@41	1460	struct razor_set *set1,
krh@41	1461	unsigned long *map1,
krh@41	1462	struct razor_set *set2,
krh@41	1463	unsigned long *map2)
krh@41	1464	{
krh@41	1465	struct razor_property p1, p2;
krh@41	1466	int i, j, cmp, count1, count2;
krh@41	1467	char pool1, pool2;
krh@41	1468
krh@41	1469	i = 0;
krh@41	1470	j = 0;
krh@41	1471	pool1 = set1->string_pool.data;
krh@41	1472	pool2 = set2->string_pool.data;
krh@41	1473
krh@66	1474	count1 = set1->properties.size / sizeof *p1;
krh@66	1475	count2 = set2->properties.size / sizeof *p2;
krh@41	1476	while (i < count1 \|\| j < count2) {
krh@41	1477	if (i < count1 && map1[i] == 0) {
krh@41	1478	i++;
krh@41	1479	continue;
krh@41	1480	}
krh@41	1481	if (j < count2 && map2[j] == 0) {
krh@41	1482	j++;
krh@41	1483	continue;
krh@41	1484	}
krh@66	1485	p1 = (struct razor_property *) set1->properties.data + i;
krh@66	1486	p2 = (struct razor_property *) set2->properties.data + j;
krh@41	1487	if (i < count1 && j < count2)
krh@66	1488	cmp = strcmp(&pool1[p1->name & RAZOR_ENTRY_MASK],
krh@66	1489	&pool2[p2->name & RAZOR_ENTRY_MASK]);
krh@41	1490	else if (i < count1)
krh@41	1491	cmp = -1;
krh@41	1492	else
krh@41	1493	cmp = 1;
krh@41	1494	if (cmp == 0)
krh@41	1495	cmp = versioncmp(&pool1[p1->version],
krh@41	1496	&pool2[p2->version]);
krh@41	1497	if (cmp < 0) {
krh@41	1498	map1[i++] = add_property(importer,
krh@66	1499	&pool1[p1->name & RAZOR_ENTRY_MASK],
krh@69	1500	&pool1[p1->version],
krh@69	1501	(p1->name >> 30));
krh@41	1502	} else if (cmp > 0) {
krh@41	1503	map2[j++] = add_property(importer,
krh@66	1504	&pool2[p2->name & RAZOR_ENTRY_MASK],
krh@69	1505	&pool2[p2->version],
krh@69	1506	(p2->name >> 30));
krh@41	1507	} else {
krh@41	1508	map1[i++] = map2[j++] = add_property(importer,
krh@66	1509	&pool1[p1->name & RAZOR_ENTRY_MASK],
krh@69	1510	&pool1[p1->version],
krh@69	1511	(p1->name >> 30));
krh@41	1512	}
krh@41	1513	}
krh@41	1514	}
krh@41	1515
krh@41	1516	static unsigned long
krh@41	1517	emit_properties(struct array *source_pool, unsigned long index,
krh@41	1518	unsigned long map, struct array pool)
krh@41	1519	{
krh@41	1520	unsigned long r, p, q;
krh@41	1521
krh@41	1522	r = pool->size / sizeof *q;
krh@41	1523	p = (unsigned long *) source_pool->data + index;
krh@64	1524	while (1) {
krh@41	1525	q = array_add(pool, sizeof *q);
krh@64	1526	q = map[p & RAZOR_ENTRY_MASK] \| (*p & ~RAZOR_ENTRY_MASK);
krh@64	1527	if (*p++ & RAZOR_ENTRY_LAST)
krh@64	1528	break;
krh@33	1529	}
krh@33	1530
krh@41	1531	return r;
krh@41	1532	}
krh@41	1533
krh@41	1534	/* Rebuild property->packages maps. We can't just remap these, as a
krh@41	1535	* property may have lost or gained a number of packages. Allocate an
krh@41	1536	* array per property and loop through the packages and add them to
krh@41	1537	* the arrays for their properties. */
krh@41	1538	static void
krh@41	1539	rebuild_package_lists(struct razor_set *set)
krh@41	1540	{
krh@66	1541	struct array pkgs, a;
krh@41	1542	struct razor_package pkg, pkg_end;
krh@41	1543	struct razor_property prop, prop_end;
krh@66	1544	unsigned long r, q, *pool;
krh@66	1545	int count;
krh@41	1546
krh@66	1547	count = set->properties.size / sizeof (struct razor_property);
krh@66	1548	pkgs = zalloc(count * sizeof *pkgs);
krh@41	1549	pkg_end = set->packages.data + set->packages.size;
krh@66	1550	pool = set->property_pool.data;
krh@41	1551
krh@41	1552	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
krh@66	1553	for (r = &pool[pkg->properties]; ; r++) {
krh@66	1554	q = array_add(&pkgs[r & RAZOR_ENTRY_MASK], sizeof q);
krh@41	1555	q = pkg - (struct razor_package ) set->packages.data;
krh@64	1556	if (*r & RAZOR_IMMEDIATE)
krh@64	1557	break;
krh@41	1558	}
krh@33	1559	}
krh@33	1560
krh@66	1561	prop_end = set->properties.data + set->properties.size;
krh@66	1562	a = pkgs;
krh@66	1563	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
krh@61	1564	if (a->size / sizeof *r == 1) {
krh@61	1565	r = a->data;
krh@61	1566	prop->packages = *r \| RAZOR_IMMEDIATE;
krh@61	1567	} else {
krh@61	1568	prop->packages =
krh@66	1569	add_to_property_pool(&set->property_pool, a);
krh@61	1570	}
krh@41	1571	array_release(a);
krh@41	1572	}
krh@66	1573	free(pkgs);
krh@33	1574	}
krh@33	1575
krh@33	1576	/* Add packages from 'upstream' to 'set'. The packages to add are
krh@33	1577	* specified by the 'packages' array, which is a sorted list of
krh@33	1578	* package indexes. Returns a newly allocated package set. Does not
krh@41	1579	* enforce validity of the resulting package set.
krh@41	1580	*
krh@41	1581	* This looks more complicated than it is. An easy way to merge two
krh@41	1582	* package sets would be to just use a razor_importer, but that
krh@41	1583	* requires resorting, and is thus O(n log n). We can do this in a
krh@41	1584	* linear sweep, but it gets a little more complicated.
krh@41	1585	*/
krh@33	1586	struct razor_set *
krh@33	1587	razor_set_add(struct razor_set set, struct razor_set upstream,
krh@33	1588	struct array *packages)
krh@33	1589	{
krh@41	1590	struct razor_set *result;
krh@33	1591	struct razor_importer *importer;
krh@41	1592	struct razor_package p, pend;
krh@41	1593	struct source source, upstream_source;
krh@33	1594
krh@33	1595	importer = razor_importer_new();
krh@33	1596
krh@41	1597	prepare_source(&upstream_source, upstream);
krh@41	1598	prepare_source(&source, set);
krh@41	1599
krh@41	1600	merge_packages(importer, &source, &upstream_source, packages);
krh@41	1601
krh@41	1602	/* As we built the package list, we filled out a bitvector of
krh@41	1603	* the properties that are referenced by the packages in the
krh@41	1604	* new set. Now we do a parallel loop through the properties
krh@41	1605	* and emit those marked in the bit vector to the new set. In
krh@41	1606	* the process, we update the bit vector to actually map from
krh@41	1607	* indices in the old property list to indices in the new
krh@41	1608	* property list for both sets. */
krh@41	1609
krh@66	1610	merge_properties(importer,
krh@66	1611	set, source.property_map,
krh@66	1612	upstream, upstream_source.property_map);
krh@41	1613
krh@41	1614	/* Now we loop through the packages again and emit the
krh@41	1615	* property lists, remapped to point to the new properties. */
krh@41	1616
krh@41	1617	pend = importer->set->packages.data + importer->set->packages.size;
krh@41	1618	for (p = importer->set->packages.data; p < pend; p++) {
krh@41	1619	struct source *src;
krh@41	1620
krh@41	1621	if (p->name & UPSTREAM_SOURCE)
krh@41	1622	src = &upstream_source;
krh@41	1623	else
krh@41	1624	src = &source;
krh@41	1625
krh@66	1626	p->properties = emit_properties(&src->set->property_pool,
krh@66	1627	p->properties,
krh@66	1628	src->property_map,
krh@66	1629	&importer->set->property_pool);
krh@41	1630	p->name &= INDEX_MASK;
krh@33	1631	}
krh@33	1632
krh@41	1633	rebuild_package_lists(importer->set);
krh@41	1634
krh@41	1635	result = importer->set;
krh@78	1636	hashtable_release(&importer->table);
krh@41	1637	free(importer);
krh@41	1638
krh@41	1639	return result;
krh@33	1640	}
krh@33	1641
krh@37	1642	void
krh@37	1643	razor_set_satisfy(struct razor_set set, struct array unsatisfied,
krh@37	1644	struct razor_set upstream, struct array list)
krh@37	1645	{
krh@37	1646	struct razor_property requires, r;
krh@37	1647	struct razor_property p, pend;
krh@39	1648	unsigned long u, end, pkg, package_pool;
krh@37	1649	char pool, upool;
krh@37	1650
krh@37	1651	end = unsatisfied->data + unsatisfied->size;
krh@66	1652	requires = set->properties.data;
krh@37	1653	pool = set->string_pool.data;
krh@37	1654
krh@66	1655	p = upstream->properties.data;
krh@66	1656	pend = upstream->properties.data + upstream->properties.size;
krh@37	1657	upool = upstream->string_pool.data;
krh@39	1658	package_pool = upstream->package_pool.data;
krh@37	1659
krh@37	1660	for (u = unsatisfied->data; u < end; u++) {
krh@37	1661	r = requires + *u;
krh@37	1662
krh@66	1663	while (p < pend &&
krh@66	1664	strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
krh@66	1665	&upool[p->name & RAZOR_ENTRY_MASK]) > 0 &&
krh@66	1666	(p->name >> 30) != RAZOR_PROPERTY_PROVIDES)
krh@37	1667	p++;
krh@37	1668	/* If there is more than one version of a provides,
krh@37	1669	* seek to the end for the highest version. */
krh@37	1670	while (p + 1 < pend && p->name == (p + 1)->name)
krh@37	1671	p++;
krh@37	1672
krh@37	1673	if (p == pend \|\|
krh@66	1674	strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
krh@66	1675	&upool[p->name & RAZOR_ENTRY_MASK]) != 0 \|\|
krh@37	1676	versioncmp(&pool[r->version], &upool[p->version]) > 0) {
krh@37	1677	/* Do we need to track unsatisfiable requires
krh@37	1678	* as we go, or should we just do a
krh@37	1679	* razor_set_validate() at the end? */
krh@37	1680	} else {
krh@37	1681	pkg = array_add(list, sizeof *pkg);
krh@37	1682	/* We just pull in the first package that provides */
krh@61	1683	if (p->packages & RAZOR_IMMEDIATE)
krh@61	1684	*pkg = p->packages & RAZOR_ENTRY_MASK;
krh@61	1685	else
krh@61	1686	*pkg = package_pool[p->packages];
krh@37	1687	}
krh@37	1688	}
krh@37	1689	}
krh@37	1690
krh@38	1691	static void
krh@38	1692	find_packages(struct razor_set *set,
krh@38	1693	int count, const char *packages, struct array list)
krh@38	1694	{
krh@38	1695	struct razor_package *p;
krh@38	1696	unsigned long *r;
krh@38	1697	int i;
krh@38	1698
krh@38	1699	/* FIXME: Sort the packages. */
krh@38	1700	for (i = 0; i < count; i++) {
krh@38	1701	p = razor_set_get_package(set, packages[i]);
krh@38	1702	r = array_add(list, sizeof *r);
krh@38	1703	r = p - (struct razor_package ) set->packages.data;
krh@38	1704	}
krh@38	1705	}
krh@38	1706
krh@38	1707	static void
krh@38	1708	find_all_packages(struct razor_set *set,
krh@38	1709	struct razor_set upstream, struct array list)
krh@38	1710	{
krh@38	1711	struct razor_package p, u, pend, uend;
krh@38	1712	unsigned long *r;
krh@38	1713	char pool, upool;
krh@38	1714
krh@38	1715	pend = set->packages.data + set->packages.size;
krh@38	1716	pool = set->string_pool.data;
krh@38	1717	u = upstream->packages.data;
krh@38	1718	uend = upstream->packages.data + upstream->packages.size;
krh@38	1719	upool = upstream->string_pool.data;
krh@38	1720
krh@38	1721	for (p = set->packages.data; p < pend; p++) {
krh@38	1722	while (u < uend && strcmp(&pool[p->name], &upool[u->name]) > 0)
krh@38	1723	u++;
krh@38	1724	if (strcmp(&pool[p->name], &upool[u->name]) == 0) {
krh@38	1725	r = array_add(list, sizeof *r);
krh@38	1726	r = u - (struct razor_package ) upstream->packages.data;
krh@38	1727	}
krh@38	1728	}
krh@38	1729	}
krh@38	1730
krh@33	1731	struct razor_set *
krh@33	1732	razor_set_update(struct razor_set set, struct razor_set upstream,
krh@33	1733	int count, const char **packages)
krh@33	1734	{
krh@37	1735	struct razor_set *new;
krh@43	1736	struct razor_package *upackages;
krh@37	1737	struct array list, unsatisfied;
krh@37	1738	char *pool;
krh@38	1739	unsigned long u, end;
krh@38	1740	int total = 0;
krh@33	1741
krh@33	1742	array_init(&list);
krh@38	1743	if (count > 0)
krh@38	1744	find_packages(upstream, count, packages, &list);
krh@38	1745	else
krh@38	1746	find_all_packages(set, upstream, &list);
krh@33	1747
krh@37	1748	end = list.data + list.size;
krh@37	1749	upackages = upstream->packages.data;
krh@37	1750	pool = upstream->string_pool.data;
krh@38	1751	total += list.size / sizeof *u;
krh@37	1752
krh@37	1753	while (list.size > 0) {
krh@37	1754	new = razor_set_add(set, upstream, &list);
krh@37	1755	array_release(&list);
krh@37	1756	razor_set_destroy(set);
krh@37	1757	set = new;
krh@37	1758
krh@37	1759	array_init(&unsatisfied);
krh@37	1760	razor_set_validate(new, &unsatisfied);
krh@37	1761	array_init(&list);
krh@37	1762	razor_set_satisfy(new, &unsatisfied, upstream, &list);
krh@37	1763	array_release(&unsatisfied);
krh@37	1764
krh@37	1765	end = list.data + list.size;
krh@37	1766	upackages = upstream->packages.data;
krh@37	1767	pool = upstream->string_pool.data;
krh@38	1768	total += list.size / sizeof *u;
krh@37	1769	}
krh@37	1770
krh@37	1771	array_release(&list);
krh@37	1772
krh@37	1773	return set;
krh@33	1774	}
krh@33	1775
krh@44	1776	/* The diff order matters. We should sort the packages so that a
krh@44	1777	* REMOVE of a package comes before the INSTALL, and so that all
krh@44	1778	* requires for a package have been installed before the package.
krh@44	1779	**/
krh@44	1780
krh@44	1781	void
krh@44	1782	razor_set_diff(struct razor_set set, struct razor_set upstream,
krh@44	1783	razor_package_callback_t callback, void *data)
krh@44	1784	{
krh@44	1785	struct razor_package p, pend, u, uend;
krh@44	1786	char ppool, upool;
krh@44	1787	int res = 0;
krh@44	1788
krh@44	1789	p = set->packages.data;
krh@44	1790	pend = set->packages.data + set->packages.size;
krh@44	1791	ppool = set->string_pool.data;
krh@44	1792
krh@44	1793	u = upstream->packages.data;
krh@44	1794	uend = upstream->packages.data + upstream->packages.size;
krh@44	1795	upool = upstream->string_pool.data;
krh@44	1796
krh@44	1797	while (p < pend \|\| u < uend) {
krh@44	1798	if (p < pend && u < uend) {
krh@44	1799	res = strcmp(&ppool[p->name], &upool[u->name]);
krh@44	1800	if (res == 0)
krh@44	1801	res = versioncmp(&ppool[p->version],
krh@44	1802	&upool[u->version]);
krh@44	1803	}
krh@44	1804
krh@44	1805	if (u == uend \|\| res < 0) {
krh@44	1806	callback(&ppool[p->name], &ppool[p->version],
krh@44	1807	NULL, data);
krh@44	1808	p++;
krh@44	1809	continue;
krh@44	1810	} else if (p == pend \|\| res > 0) {
krh@44	1811	callback(&upool[u->name], NULL, &upool[u->version],
krh@44	1812	data);
krh@44	1813	u++;
krh@44	1814	continue;
krh@44	1815	} else {
krh@44	1816	p++;
krh@44	1817	u++;
krh@44	1818	}
krh@44	1819	}
krh@44	1820	}

author	Kristian H?gsberg <krh@redhat.com>
	Sun Nov 11 14:57:42 2007 -0500 (2007-11-11)
changeset 78	89c06e68824a
parent 75	93278d8ec39c
child 79	9f302fa29d83
permissions	-rw-r--r--