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