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