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