razor.c
author Dan Winship <danw@gnome.org>
Mon Mar 10 14:12:31 2008 -0400 (2008-03-10)
changeset 159 9307d0e0b44f
parent 156 5197b8e64e42
child 160 00f19df51272
permissions -rw-r--r--
when importing, create fake file PROVIDES to match file REQUIRES
     1 #define _GNU_SOURCE
     2 
     3 #include <stdlib.h>
     4 #include <stddef.h>
     5 #include <stdint.h>
     6 #include <stdio.h>
     7 #include <string.h>
     8 #include <sys/types.h>
     9 #include <sys/stat.h>
    10 #include <sys/mman.h>
    11 #include <unistd.h>
    12 #include <fcntl.h>
    13 #include <errno.h>
    14 #include <ctype.h>
    15 #include <fnmatch.h>
    16 
    17 #include "razor.h"
    18 #include "razor-internal.h"
    19 #include "types.h"
    20 
    21 struct razor_set_section {
    22 	uint32_t type;
    23 	uint32_t offset;
    24 	uint32_t size;
    25 };
    26 
    27 struct razor_set_header {
    28 	uint32_t magic;
    29 	uint32_t version;
    30 	struct razor_set_section sections[0];
    31 };
    32 
    33 #define RAZOR_MAGIC 0x7a7a7a7a
    34 #define RAZOR_VERSION 1
    35 
    36 #define RAZOR_STRING_POOL	0
    37 #define RAZOR_PACKAGES		1
    38 #define RAZOR_PROPERTIES	2
    39 #define RAZOR_FILES		3
    40 #define RAZOR_PACKAGE_POOL	4
    41 #define RAZOR_PROPERTY_POOL	5
    42 #define RAZOR_FILE_POOL		6
    43 
    44 struct razor_package {
    45 	uint name  : 24;
    46 	uint flags : 8;
    47 	uint32_t version;
    48 	struct list_head properties;
    49 	struct list_head files;
    50 };
    51 
    52 struct razor_property {
    53 	uint name  : 24;
    54 	uint flags : 6;
    55 	uint type  : 2;
    56 	uint32_t relation;
    57 	uint32_t version;
    58 	struct list_head packages;
    59 };
    60 
    61 struct razor_entry {
    62 	uint name  : 24;
    63 	uint flags : 8;
    64 	uint32_t start;
    65 	struct list_head packages;
    66 };
    67 
    68 #define RAZOR_ENTRY_LAST	0x80
    69 
    70 struct razor_set {
    71 	struct array string_pool;
    72  	struct array packages;
    73  	struct array properties;
    74  	struct array files;
    75 	struct array package_pool;
    76  	struct array property_pool;
    77  	struct array file_pool;
    78 	struct razor_set_header *header;
    79 };
    80 
    81 struct import_entry {
    82 	uint32_t package;
    83 	char *name;
    84 };
    85 
    86 struct import_directory {
    87 	uint32_t name, count;
    88 	struct array files;
    89 	struct array packages;
    90 	struct import_directory *last;
    91 };
    92 
    93 struct razor_importer {
    94 	struct razor_set *set;
    95 	struct hashtable table;
    96 	struct razor_package *package;
    97 	struct array properties;
    98 	struct array files;
    99 	struct array file_requires;
   100 };
   101 
   102 static void *
   103 zalloc(size_t size)
   104 {
   105 	void *p;
   106 
   107 	p = malloc(size);
   108 	memset(p, 0, size);
   109 
   110 	return p;
   111 }
   112 
   113 struct razor_set_section razor_sections[] = {
   114 	{ RAZOR_STRING_POOL,	offsetof(struct razor_set, string_pool) },
   115 	{ RAZOR_PACKAGES,	offsetof(struct razor_set, packages) },
   116 	{ RAZOR_PROPERTIES,	offsetof(struct razor_set, properties) },
   117 	{ RAZOR_FILES,		offsetof(struct razor_set, files) },
   118 	{ RAZOR_PACKAGE_POOL,	offsetof(struct razor_set, package_pool) },
   119 	{ RAZOR_PROPERTY_POOL,	offsetof(struct razor_set, property_pool) },
   120 	{ RAZOR_FILE_POOL,	offsetof(struct razor_set, file_pool) },
   121 };
   122 
   123 struct razor_set *
   124 razor_set_create(void)
   125 {
   126 	struct razor_set *set;
   127 	struct razor_entry *e;
   128 
   129 	set = zalloc(sizeof *set);
   130 
   131 	array_init(&set->files);
   132 	e = array_add(&set->files, sizeof *e);
   133 	e->name = 0;
   134 	e->flags = RAZOR_ENTRY_LAST;
   135 	e->start = 0;
   136 	list_set_empty(&e->packages);
   137 
   138 	return set;
   139 }
   140 
   141 struct razor_set *
   142 razor_set_open(const char *filename)
   143 {
   144 	struct razor_set *set;
   145 	struct razor_set_section *s;
   146 	struct stat stat;
   147 	struct array *array;
   148 	int fd;
   149 
   150 	set = zalloc(sizeof *set);
   151 	fd = open(filename, O_RDONLY);
   152 	if (fstat(fd, &stat) < 0)
   153 		return NULL;
   154 	set->header = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
   155 	if (set->header == MAP_FAILED) {
   156 		free(set);
   157 		return NULL;
   158 	}
   159 
   160 	for (s = set->header->sections; ~s->type; s++) {
   161 		if (s->type >= ARRAY_SIZE(razor_sections))
   162 			continue;
   163 		if (s->type != razor_sections[s->type].type)
   164 			continue;
   165 		array = (void *) set + razor_sections[s->type].offset;
   166 		array->data = (void *) set->header + s->offset;
   167 		array->size = s->size;
   168 		array->alloc = s->size;
   169 	}
   170 	close(fd);
   171 
   172 	return set;
   173 }
   174 
   175 void
   176 razor_set_destroy(struct razor_set *set)
   177 {
   178 	unsigned int size;
   179 	struct array *a;
   180 	int i;
   181 
   182 	if (set->header) {
   183 		for (i = 0; set->header->sections[i].type; i++)
   184 			;
   185 		size = set->header->sections[i].type;
   186 		munmap(set->header, size);
   187 	} else {
   188 		for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   189 			a = (void *) set + razor_sections[i].offset;
   190 			free(a->data);
   191 		}
   192 	}
   193 
   194 	free(set);
   195 }
   196 
   197 int
   198 razor_set_write(struct razor_set *set, const char *filename)
   199 {
   200 	char data[4096];
   201 	struct razor_set_header *header = (struct razor_set_header *) data;
   202 	struct array *a;
   203 	uint32_t offset;
   204 	int i, fd;
   205 
   206 	memset(data, 0, sizeof data);
   207 	header->magic = RAZOR_MAGIC;
   208 	header->version = RAZOR_VERSION;
   209 	offset = sizeof data;
   210 
   211 	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   212 		if (razor_sections[i].type != i)
   213 			continue;
   214 		a = (void *) set + razor_sections[i].offset;
   215 		header->sections[i].type = i;
   216 		header->sections[i].offset = offset;
   217 		header->sections[i].size = a->size;
   218 		offset += ALIGN(a->size, 4096);
   219 	}
   220 
   221 	header->sections[i].type = ~0;
   222 	header->sections[i].offset = 0;
   223 	header->sections[i].size = 0;
   224 
   225 	fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
   226 	if (fd < 0)
   227 		return -1;
   228 
   229 	razor_write(fd, data, sizeof data);
   230 	memset(data, 0, sizeof data);
   231 	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   232 		if (razor_sections[i].type != i)
   233 			continue;
   234 		a = (void *) set + razor_sections[i].offset;
   235 		razor_write(fd, a->data, a->size);
   236 		razor_write(fd, data, ALIGN(a->size, 4096) - a->size);
   237 	}
   238 
   239 	close(fd);
   240 
   241 	return 0;
   242 }
   243 
   244 void
   245 razor_build_evr(char *evr_buf, int size, const char *epoch,
   246 		const char *version, const char *release)
   247 {
   248 	int len;
   249 
   250 	if (!version || !*version) {
   251 		*evr_buf = '\0';
   252 		return;
   253 	}
   254 
   255 	if (epoch && *epoch && strcmp(epoch, "0") != 0) {
   256 		len = snprintf(evr_buf, size, "%s:", epoch);
   257 		evr_buf += len;
   258 		size -= len;
   259 	}
   260 	len = snprintf(evr_buf, size, "%s", version);
   261 	evr_buf += len;
   262 	size -= len;
   263 	if (release && *release)
   264 		snprintf(evr_buf, size, "-%s", release);
   265 }
   266 
   267 void
   268 razor_importer_begin_package(struct razor_importer *importer,
   269 			     const char *name, const char *version)
   270 {
   271 	struct razor_package *p;
   272 
   273 	p = array_add(&importer->set->packages, sizeof *p);
   274 	p->name = hashtable_tokenize(&importer->table, name);
   275 	p->flags = 0;
   276 	p->version = hashtable_tokenize(&importer->table, version);
   277 
   278 	importer->package = p;
   279 	array_init(&importer->properties);
   280 }
   281 
   282 void
   283 razor_importer_finish_package(struct razor_importer *importer)
   284 {
   285 	list_set_array(&importer->package->properties,
   286 		       &importer->set->property_pool,
   287 		       &importer->properties,
   288 		       1);
   289 
   290 	array_release(&importer->properties);
   291 }
   292 
   293 void
   294 razor_importer_add_property(struct razor_importer *importer,
   295 			    const char *name,
   296 			    enum razor_version_relation relation,
   297 			    const char *version,
   298 			    enum razor_property_type type)
   299 {
   300 	struct razor_property *p;
   301 	uint32_t *r;
   302 
   303 	p = array_add(&importer->set->properties, sizeof *p);
   304 	p->name = hashtable_tokenize(&importer->table, name);
   305 	p->flags = 0;
   306 	p->type = type;
   307 	p->relation = relation;
   308 	p->version = hashtable_tokenize(&importer->table, version);
   309 	list_set_ptr(&p->packages, importer->package -
   310 		     (struct razor_package *) importer->set->packages.data);
   311 
   312 	r = array_add(&importer->properties, sizeof *r);
   313 	*r = p - (struct razor_property *) importer->set->properties.data;
   314 
   315 	if (type == RAZOR_PROPERTY_REQUIRES && *name == '/') {
   316 		r = array_add(&importer->file_requires, sizeof *r);
   317 		*r = p->name;
   318 	}
   319 }
   320 
   321 void
   322 razor_importer_add_file(struct razor_importer *importer, const char *name)
   323 {
   324 	struct import_entry *e;
   325 
   326 	e = array_add(&importer->files, sizeof *e);
   327 
   328 	e->package = importer->package -
   329 		(struct razor_package *) importer->set->packages.data;
   330 	e->name = strdup(name);
   331 }
   332 
   333 struct razor_importer *
   334 razor_importer_new(void)
   335 {
   336 	struct razor_importer *importer;
   337 
   338 	importer = zalloc(sizeof *importer);
   339 	importer->set = razor_set_create();
   340 	hashtable_init(&importer->table, &importer->set->string_pool);
   341 
   342 	return importer;
   343 }
   344 
   345 /* Destroy an importer without creating the set. */
   346 void
   347 razor_importer_destroy(struct razor_importer *importer)
   348 {
   349 	/* FIXME: write this */
   350 }
   351 
   352 
   353 typedef int (*compare_with_data_func_t)(const void *p1,
   354 					const void *p,
   355 					void *data);
   356 
   357 struct qsort_context {
   358 	size_t size;
   359 	compare_with_data_func_t compare;
   360 	void *data;
   361 };
   362 
   363 static void
   364 qsort_swap(void *p1, void *p2, size_t size)
   365 {
   366 	char buffer[size];
   367 
   368 	memcpy(buffer, p1, size);
   369 	memcpy(p1, p2, size);
   370 	memcpy(p2, buffer, size);
   371 }
   372 
   373 static void
   374 __qsort_with_data(void *base, size_t nelem, uint32_t *map,
   375 		  struct qsort_context *ctx)
   376 {
   377 	void *p, *start, *end, *pivot;
   378 	uint32_t *mp, *mstart, *mend, tmp;
   379 	int left, right, result;
   380 	size_t size = ctx->size;
   381 
   382 	p = base;
   383 	start = base;
   384 	end = base + nelem * size;
   385 	mp = map;
   386 	mstart = map;
   387 	mend = map + nelem;
   388 	pivot = base + (random() % nelem) * size;
   389 
   390 	while (p < end) {
   391 		result = ctx->compare(p, pivot, ctx->data);
   392 		if (result < 0) {
   393 			qsort_swap(p, start, size);
   394 			tmp = *mp;
   395 			*mp = *mstart;
   396 			*mstart = tmp;
   397 			if (start == pivot)
   398 				pivot = p;
   399 			start += size;
   400 			mstart++;
   401 			p += size;
   402 			mp++;
   403 		} else if (result == 0) {
   404 			p += size;
   405 			mp++;
   406 		} else {
   407  			end -= size;
   408 			mend--;
   409 			qsort_swap(p, end, size);
   410 			tmp = *mp;
   411 			*mp = *mend;
   412 			*mend = tmp;
   413 			if (end == pivot)
   414 				pivot = p;
   415 		}
   416 	}
   417 
   418 	left = (start - base) / size;
   419 	right = (base + nelem * size - end) / size;
   420 	if (left > 1)
   421 		__qsort_with_data(base, left, map, ctx);
   422 	if (right > 1)
   423 		__qsort_with_data(end, right, mend, ctx);
   424 }
   425 
   426 static uint32_t *
   427 qsort_with_data(void *base, size_t nelem, size_t size,
   428 		compare_with_data_func_t compare, void *data)
   429 {
   430 	struct qsort_context ctx;
   431 	uint32_t *map;
   432 	int i;
   433 
   434 	if (nelem == 0)
   435 		return NULL;
   436 
   437 	ctx.size = size;
   438 	ctx.compare = compare;
   439 	ctx.data = data;
   440 
   441 	map = malloc(nelem * sizeof (uint32_t));
   442 	for (i = 0; i < nelem; i++)
   443 		map[i] = i;
   444 
   445 	__qsort_with_data(base, nelem, map, &ctx);
   446 
   447 	return map;
   448 }
   449 
   450 static int
   451 versioncmp(const char *s1, const char *s2)
   452 {
   453 	const char *p1, *p2;
   454 	long n1, n2;
   455 	int res;
   456 
   457 	n1 = strtol(s1, (char **) &p1, 10);
   458 	n2 = strtol(s2, (char **) &p2, 10);
   459 
   460 	/* Epoch; if one but not the other has an epoch set, default
   461 	 * the epoch-less version to 0. */
   462 	res = (*p1 == ':') - (*p2 == ':');
   463 	if (res < 0) {
   464 		n1 = 0;
   465 		p1 = s1;
   466 		p2++;
   467 	} else if (res > 0) {
   468 		p1++;
   469 		n2 = 0;
   470 		p2 = s2;
   471 	}
   472 
   473 	if (n1 != n2)
   474 		return n1 - n2;
   475 	while (*p1 && *p2) {
   476 		if (*p1 != *p2)
   477 			return *p1 - *p2;
   478 		p1++;
   479 		p2++;
   480 		if (isdigit(*p1) && isdigit(*p2))
   481 			return versioncmp(p1, p2);
   482 	}
   483 
   484 	return *p1 - *p2;
   485 }
   486 
   487 static int
   488 compare_packages(const void *p1, const void *p2, void *data)
   489 {
   490 	const struct razor_package *pkg1 = p1, *pkg2 = p2;
   491 	struct razor_set *set = data;
   492 	char *pool = set->string_pool.data;
   493 
   494 	/* FIXME: what if the flags are different? */
   495 	if (pkg1->name == pkg2->name)
   496 		return versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
   497 	else
   498 		return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
   499 }
   500 
   501 static int
   502 compare_properties(const void *p1, const void *p2, void *data)
   503 {
   504 	const struct razor_property *prop1 = p1, *prop2 = p2;
   505 	struct razor_set *set = data;
   506 	char *pool = set->string_pool.data;
   507 
   508 	if (prop1->name != prop2->name) 
   509 		return strcmp(&pool[prop1->name], &pool[prop2->name]);
   510 	else if (prop1->type != prop2->type)
   511 		return prop1->type - prop2->type;
   512 	else if (prop1->relation != prop2->relation)
   513 		return prop1->relation - prop2->relation;
   514 	else
   515 		return versioncmp(&pool[prop1->version], &pool[prop2->version]);
   516 }
   517 
   518 static uint32_t *
   519 uniqueify_properties(struct razor_set *set)
   520 {
   521 	struct razor_property *rp, *up, *rp_end;
   522 	struct array *pkgs, *p;
   523 	struct list_head *r;
   524 	uint32_t *map, *rmap;
   525 	int i, count, unique;
   526 
   527 	count = set->properties.size / sizeof(struct razor_property);
   528 	map = qsort_with_data(set->properties.data,
   529 			      count,
   530 			      sizeof(struct razor_property),
   531 			      compare_properties,
   532 			      set);
   533 
   534 	rp_end = set->properties.data + set->properties.size;
   535 	rmap = malloc(count * sizeof *map);
   536 	pkgs = zalloc(count * sizeof *pkgs);
   537 	for (rp = set->properties.data, up = rp, i = 0; rp < rp_end; rp++, i++) {
   538 		if (rp->name != up->name || rp->type != up->type ||
   539 		    rp->relation != up->relation || rp->version != up->version) {
   540 			up++;
   541 			up->name = rp->name;
   542 			up->flags = 0;
   543 			up->type = rp->type;
   544 			up->relation = rp->relation;
   545 			up->version = rp->version;
   546 		}
   547 
   548 		unique = up - (struct razor_property *) set->properties.data;
   549 		rmap[map[i]] = unique;
   550 		r = array_add(&pkgs[unique], sizeof *r);
   551 		*r = rp->packages;
   552 	}
   553 	free(map);
   554 
   555 	if (up != rp)
   556 		up++;
   557 	set->properties.size = (void *) up - set->properties.data;
   558 	rp_end = up;
   559 	for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
   560 		list_set_array(&rp->packages, &set->package_pool, p, 0);
   561 		array_release(p);
   562 	}
   563 
   564 	free(pkgs);
   565 
   566 	return rmap;
   567 }
   568 
   569 static int
   570 compare_filenames(const void *p1, const void *p2, void *data)
   571 {
   572 	const struct import_entry *e1 = p1;
   573 	const struct import_entry *e2 = p2;
   574 	const char *n1 = e1->name;
   575 	const char *n2 = e2->name;
   576 
   577 	/* Need to make sure that the contents of a directory
   578 	 * are sorted immediately after it. So "foo/bar" has to
   579 	 * sort before "foo.conf"
   580 	 *
   581 	 * FIXME: this is about 60% slower than strcmp
   582 	 */
   583 	while (*n1 && *n2) {
   584 		if (*n1 < *n2)
   585 			return *n2 == '/' ? 1 : -1;
   586 		else if (*n1 > *n2)
   587 			return *n1 == '/' ? -1 : 1;
   588 		n1++;
   589 		n2++;
   590 	}
   591 	if (*n1)
   592 		return 1;
   593 	else if (*n2)
   594 		return -1;
   595 	else
   596 		return 0;
   597 }
   598 
   599 static void
   600 count_entries(struct import_directory *d)
   601 {
   602 	struct import_directory *p, *end;
   603 
   604 	p = d->files.data;
   605 	end = d->files.data + d->files.size;
   606 	d->count = 0;
   607 	while (p < end) {
   608 		count_entries(p);
   609 		d->count += p->count + 1;
   610 		p++;
   611 	}		
   612 }
   613 
   614 static void
   615 serialize_files(struct razor_set *set,
   616 		struct import_directory *d, struct array *array)
   617 {
   618 	struct import_directory *p, *end;
   619 	struct razor_entry *e = NULL;
   620 	uint32_t s;
   621 
   622 	p = d->files.data;
   623 	end = d->files.data + d->files.size;
   624 	s = array->size / sizeof *e + d->files.size / sizeof *p;
   625 	while (p < end) {
   626 		e = array_add(array, sizeof *e);
   627 		e->name = p->name;
   628 		e->flags = 0;
   629 		e->start = p->count > 0 ? s : 0;
   630 		s += p->count;
   631 
   632 		list_set_array(&e->packages, &set->package_pool, &p->packages, 0);
   633 		array_release(&p->packages);
   634 		p++;
   635 	}		
   636 	if (e != NULL)
   637 		e->flags |= RAZOR_ENTRY_LAST;
   638 
   639 	p = d->files.data;
   640 	end = d->files.data + d->files.size;
   641 	while (p < end) {
   642 		serialize_files(set, p, array);
   643 		p++;
   644 	}
   645 }
   646 
   647 static void
   648 remap_property_package_links(struct array *properties, uint32_t *rmap)
   649 {
   650 	struct razor_property *p, *end;
   651 
   652 	end = properties->data + properties->size;
   653 	for (p = properties->data; p < end; p++)
   654 		list_remap_head(&p->packages, rmap);
   655 }
   656 
   657 static void
   658 build_file_tree(struct razor_importer *importer)
   659 {
   660 	int count, i, length;
   661 	struct import_entry *filenames;
   662 	char *f, *end;
   663 	uint32_t name, *r;
   664 	char dirname[256];
   665 	struct import_directory *d, root;
   666 	struct razor_entry *e;
   667 
   668 	count = importer->files.size / sizeof (struct import_entry);
   669 	qsort_with_data(importer->files.data,
   670 			count,
   671 			sizeof (struct import_entry),
   672 			compare_filenames,
   673 			NULL);
   674 
   675 	root.name = hashtable_tokenize(&importer->table, "");
   676 	array_init(&root.files);
   677 	array_init(&root.packages);
   678 	root.last = NULL;
   679 
   680 	filenames = importer->files.data;
   681 	for (i = 0; i < count; i++) {
   682 		f = filenames[i].name;
   683 		if (*f != '/')
   684 			continue;
   685 		f++;
   686 
   687 		d = &root;
   688 		while (*f) {
   689 			end = strchr(f, '/');
   690 			if (end == NULL)
   691 				end = f + strlen(f);
   692 			length = end - f;
   693 			memcpy(dirname, f, length);
   694 			dirname[length] ='\0';
   695 			name = hashtable_tokenize(&importer->table, dirname);
   696 			if (d->last == NULL || d->last->name != name) {
   697 				d->last = array_add(&d->files, sizeof *d);
   698 				d->last->name = name;
   699 				d->last->last = NULL;
   700 				array_init(&d->last->files);
   701 				array_init(&d->last->packages);
   702 			}
   703 			d = d->last;				
   704 			f = end + 1;
   705 			if (*end == '\0')
   706 				break;
   707 		}
   708 
   709 		r = array_add(&d->packages, sizeof *r);
   710 		*r = filenames[i].package;
   711 		free(filenames[i].name);
   712 	}
   713 
   714 	count_entries(&root);
   715 	e = importer->set->files.data;
   716 	e->name = root.name;
   717 	e->flags = RAZOR_ENTRY_LAST;
   718 	e->start = importer->files.size ? 1 : 0;
   719 	list_set_empty(&e->packages);
   720 
   721 	serialize_files(importer->set, &root, &importer->set->files);
   722 
   723 	array_release(&importer->files);
   724 }
   725 
   726 static struct razor_entry *
   727 find_entry(struct razor_set *set, struct razor_entry *dir, const char *pattern);
   728 
   729 static void
   730 list_to_array(struct list *list, struct array *array)
   731 {
   732 	uint32_t *item;
   733 
   734 	while (list) {
   735 		 item = array_add(array, sizeof *item);
   736 		 *item = list->data;
   737 		 list = list_next(list);
   738 	}
   739 }
   740 
   741 static int
   742 compare_file_requires(const void *p1, const void *p2, void *data)
   743 {
   744 	uint32_t *f1 = (void *)p1, *f2 = (void *)p2;
   745 	const char *pool = data;
   746 
   747 	return strcmp(&pool[*f1], &pool[*f2]);
   748 }
   749 
   750 static void
   751 find_file_provides(struct razor_importer *importer)
   752 {
   753 	struct razor_property *prop;
   754 	struct razor_entry *top, *entry;
   755 	struct razor_package *packages;
   756 	struct array pkgarray, pkgprops;
   757 	uint32_t *req, *req_start, *req_end, *pkg, *pkg_end;
   758 	uint32_t *map, newprop_id, *newprop;
   759 	char *pool;
   760 
   761 	pool = importer->set->string_pool.data;
   762 	packages = importer->set->packages.data;
   763 	top = importer->set->files.data;
   764 
   765 	req = req_start = importer->file_requires.data;
   766 	req_end = importer->file_requires.data + importer->file_requires.size;
   767 	map = qsort_with_data(req, req_end - req, sizeof *req,
   768 			      compare_file_requires, pool);
   769 	free(map);
   770 
   771 	for (req = req_start; req < req_end; req++) {
   772 		if (req > req_start && req[0] == req[-1])
   773 			continue;
   774 		entry = find_entry(importer->set, top, &pool[*req]);
   775 		if (entry) {
   776 			prop = array_add(&importer->set->properties, sizeof *prop);
   777 			prop->name = *req;
   778 			prop->type = RAZOR_PROPERTY_PROVIDES;
   779 			prop->relation = RAZOR_VERSION_EQUAL;
   780 			prop->version = hashtable_tokenize(&importer->table, "");
   781 
   782 			/* Copy package list from entry to property */
   783 			array_init(&pkgarray);
   784 			list_to_array(list_first(&entry->packages, &importer->set->package_pool), &pkgarray);
   785 			list_set_array(&prop->packages, &importer->set->package_pool, &pkgarray, 0);
   786 
   787 			/* Update property list of each providing package */
   788 			pkg_end = pkgarray.data + pkgarray.size;
   789 			newprop_id = prop - (struct razor_property *)importer->set->properties.data;
   790 
   791 			for (pkg = pkgarray.data; pkg < pkg_end; pkg++) {
   792 				array_init(&pkgprops);
   793 				list_to_array(list_first(&packages[*pkg].properties, &importer->set->property_pool), &pkgprops);
   794 				newprop = array_add(&pkgprops, sizeof *newprop);
   795 				*newprop = newprop_id;
   796 				list_set_array(&packages[*pkg].properties, &importer->set->property_pool, &pkgprops, 1);
   797 				array_release(&pkgprops);
   798 			}
   799 			array_release(&pkgarray);
   800 		}
   801 	}
   802 
   803 	array_release(&importer->file_requires);
   804 }
   805 
   806 static void
   807 build_package_file_lists(struct razor_set *set, uint32_t *rmap)
   808 {
   809 	struct razor_package *p, *packages;
   810 	struct array *pkgs;
   811 	struct razor_entry *e, *end;
   812 	struct list *r;
   813 	uint32_t *q;
   814 	int i, count;
   815 
   816 	count = set->packages.size / sizeof *p;
   817 	pkgs = zalloc(count * sizeof *pkgs);
   818 
   819 	end = set->files.data + set->files.size;
   820 	for (e = set->files.data; e < end; e++) {
   821 		list_remap_head(&e->packages, rmap);
   822 		r = list_first(&e->packages, &set->package_pool);
   823 		while (r) {
   824 			q = array_add(&pkgs[r->data], sizeof *q);
   825 			*q = e - (struct razor_entry *) set->files.data;
   826 			r = list_next(r);
   827 		}
   828 	}
   829 
   830 	packages = set->packages.data;
   831 	for (i = 0; i < count; i++) {
   832 		list_set_array(&packages[i].files, &set->file_pool, &pkgs[i], 0);
   833 		array_release(&pkgs[i]);
   834 	}
   835 	free(pkgs);
   836 }
   837 
   838 struct razor_set *
   839 razor_importer_finish(struct razor_importer *importer)
   840 {
   841 	struct razor_set *set;
   842 	uint32_t *map, *rmap;
   843 	int i, count;
   844 
   845 	build_file_tree(importer);
   846 	find_file_provides(importer);
   847 
   848 	map = uniqueify_properties(importer->set);
   849 	list_remap_pool(&importer->set->property_pool, map);
   850 	free(map);
   851 
   852 	count = importer->set->packages.size / sizeof(struct razor_package);
   853 	map = qsort_with_data(importer->set->packages.data,
   854 			      count,
   855 			      sizeof(struct razor_package),
   856 			      compare_packages,
   857 			      importer->set);
   858 
   859 	rmap = malloc(count * sizeof *rmap);
   860 	for (i = 0; i < count; i++)
   861 		rmap[map[i]] = i;
   862 	free(map);
   863 
   864 	list_remap_pool(&importer->set->package_pool, rmap);
   865 	build_package_file_lists(importer->set, rmap);
   866 	remap_property_package_links(&importer->set->properties, rmap);
   867 	free(rmap);
   868 
   869 	set = importer->set;
   870 	hashtable_release(&importer->table);
   871 	free(importer);
   872 
   873 	return set;
   874 }
   875 
   876 struct razor_package_iterator {
   877 	struct razor_set *set;
   878 	struct razor_package *package, *end;
   879 	struct list *index;
   880 };
   881 
   882 static struct razor_package_iterator *
   883 razor_package_iterator_create_with_index(struct razor_set *set,
   884 					 struct list *index)
   885 {
   886 	struct razor_package_iterator *pi;
   887 
   888 	pi = zalloc(sizeof *pi);
   889 	pi->set = set;
   890 	pi->index = index;
   891 
   892 	return pi;
   893 }
   894 
   895 struct razor_package_iterator *
   896 razor_package_iterator_create(struct razor_set *set)
   897 {
   898 	struct razor_package_iterator *pi;
   899 
   900 	pi = zalloc(sizeof *pi);
   901 	pi->set = set;
   902 	pi->end = set->packages.data + set->packages.size;
   903 	pi->package = set->packages.data;
   904 
   905 	return pi;
   906 }
   907 
   908 struct razor_package_iterator *
   909 razor_package_iterator_create_for_property(struct razor_set *set,
   910 					   struct razor_property *property)
   911 {
   912 	struct list *index;
   913 
   914 	index = list_first(&property->packages, &set->package_pool);
   915 	return razor_package_iterator_create_with_index(set, index);
   916 }
   917 
   918 int
   919 razor_package_iterator_next(struct razor_package_iterator *pi,
   920 			    struct razor_package **package,
   921 			    const char **name, const char **version)
   922 {
   923 	char *pool;
   924 	int valid;
   925 	struct razor_package *p, *packages;
   926 
   927 	if (pi->package) {
   928 		p = pi->package++;
   929 		valid = p < pi->end;
   930 	} else if (pi->index) {
   931 		packages = pi->set->packages.data;
   932 		p = &packages[pi->index->data];
   933 		pi->index = list_next(pi->index);
   934 		valid = 1;
   935 	} else
   936 		valid = 0;
   937 
   938 	if (valid) {
   939 		pool = pi->set->string_pool.data;
   940 		*package = p;
   941 		*name = &pool[p->name];
   942 		*version = &pool[p->version];
   943 	} else {
   944 		*package = NULL;
   945 	}
   946 
   947 	return valid;
   948 }
   949 
   950 void
   951 razor_package_iterator_destroy(struct razor_package_iterator *pi)
   952 {
   953 	free(pi);
   954 }
   955 
   956 struct razor_package *
   957 razor_set_get_package(struct razor_set *set, const char *package)
   958 {
   959 	struct razor_package_iterator *pi;
   960 	struct razor_package *p;
   961 	const char *name, *version;
   962 
   963 	pi = razor_package_iterator_create(set);
   964 	while (razor_package_iterator_next(pi, &p, &name, &version)) {
   965 		if (strcmp(package, name) == 0)
   966 			break;
   967 	}
   968 	razor_package_iterator_destroy(pi);
   969 
   970 	return p;
   971 }
   972 
   973 struct razor_property_iterator {
   974 	struct razor_set *set;
   975 	struct razor_property *property, *end;
   976 	struct list *index;
   977 };
   978 
   979 struct razor_property_iterator *
   980 razor_property_iterator_create(struct razor_set *set,
   981 			       struct razor_package *package)
   982 {
   983 	struct razor_property_iterator *pi;
   984 
   985 	pi = zalloc(sizeof *pi);
   986 	pi->set = set;
   987 
   988 	if (package) {
   989 		pi->index = list_first(&package->properties,
   990 				       &set->property_pool);
   991 	} else {
   992 		pi->property = set->properties.data;
   993 		pi->end = set->properties.data + set->properties.size;
   994 	}
   995 
   996 	return pi;
   997 }
   998 
   999 int
  1000 razor_property_iterator_next(struct razor_property_iterator *pi,
  1001 			     struct razor_property **property,
  1002 			     const char **name,
  1003 			     enum razor_version_relation *relation,
  1004 			     const char **version,
  1005 			     enum razor_property_type *type)
  1006 {
  1007 	char *pool;
  1008 	int valid;
  1009 	struct razor_property *p, *properties;
  1010 
  1011 	if (pi->property) {
  1012 		p = pi->property++;
  1013 		valid = p < pi->end;
  1014 	} else if (pi->index) {
  1015 		properties = pi->set->properties.data;
  1016 		p = &properties[pi->index->data];
  1017 		pi->index = list_next(pi->index);
  1018 		valid = 1;
  1019 	} else
  1020 		valid = 0;
  1021 
  1022 	if (valid) {
  1023 		pool = pi->set->string_pool.data;
  1024 		*property = p;
  1025 		*name = &pool[p->name];
  1026 		*relation = p->relation;
  1027 		*version = &pool[p->version];
  1028 		*type = p->type;
  1029 	} else {
  1030 		*property = NULL;
  1031 	}
  1032 
  1033 	return valid;
  1034 }
  1035 
  1036 void
  1037 razor_property_iterator_destroy(struct razor_property_iterator *pi)
  1038 {
  1039 	free(pi);
  1040 }
  1041 
  1042 static struct razor_entry *
  1043 find_entry(struct razor_set *set, struct razor_entry *dir, const char *pattern)
  1044 {
  1045 	struct razor_entry *e;
  1046 	const char *n, *pool = set->string_pool.data;
  1047 	int len;
  1048 
  1049 	e = (struct razor_entry *) set->files.data + dir->start;
  1050 	do {
  1051 		n = pool + e->name;
  1052 		if (strcmp(pattern + 1, n) == 0)
  1053 			return e;
  1054 		len = strlen(n);
  1055 		if (e->start != 0 && strncmp(pattern + 1, n, len) == 0 &&
  1056 		    pattern[len + 1] == '/') {
  1057 			return find_entry(set, e, pattern + len + 1);
  1058 		}
  1059 	} while (!((e++)->flags & RAZOR_ENTRY_LAST));
  1060 
  1061 	return NULL;
  1062 }
  1063 
  1064 static void
  1065 list_dir(struct razor_set *set, struct razor_entry *dir,
  1066 	 char *prefix, const char *pattern)
  1067 {
  1068 	struct razor_entry *e;
  1069 	const char *n, *pool = set->string_pool.data;
  1070 
  1071 	e = (struct razor_entry *) set->files.data + dir->start;
  1072 	do {
  1073 		n = pool + e->name;
  1074 		if (pattern && pattern[0] && fnmatch(pattern, n, 0) != 0)
  1075 			continue;
  1076 		printf("%s/%s\n", prefix, n);
  1077 		if (e->start) {
  1078 			char *sub = prefix + strlen (prefix);
  1079 			*sub = '/';
  1080 			strcpy (sub + 1, n);
  1081 			list_dir(set, e, prefix, pattern);
  1082 			*sub = '\0';
  1083 		}
  1084 	} while (!((e++)->flags & RAZOR_ENTRY_LAST));
  1085 }
  1086 
  1087 void
  1088 razor_set_list_files(struct razor_set *set, const char *pattern)
  1089 {
  1090 	struct razor_entry *e;
  1091 	char buffer[512], *p, *base;
  1092 
  1093 	if (pattern == NULL || !strcmp (pattern, "/")) {
  1094 		buffer[0] = '\0';
  1095 		list_dir(set, set->files.data, buffer, NULL);
  1096 		return;
  1097 	}
  1098 
  1099 	strcpy(buffer, pattern);
  1100 	e = find_entry(set, set->files.data, buffer);
  1101 	if (e && e->start > 0) {
  1102 		base = NULL;
  1103 	} else {
  1104 		p = strrchr(buffer, '/');
  1105 		if (p) {
  1106 			*p = '\0';
  1107 			base = p + 1;
  1108 		} else {
  1109 			base = NULL;
  1110 		}
  1111 	}
  1112 	e = find_entry(set, set->files.data, buffer);
  1113 	if (e->start != 0)
  1114 		list_dir(set, e, buffer, base);
  1115 }
  1116 
  1117 struct razor_package_iterator *
  1118 razor_package_iterator_create_for_file(struct razor_set *set,
  1119 				       const char *filename)
  1120 {
  1121 	struct razor_entry *entry;
  1122 	struct list *index;
  1123 
  1124 	entry = find_entry(set, set->files.data, filename);
  1125 	if (entry == NULL)
  1126 		return NULL;
  1127 	
  1128 	index = list_first(&entry->packages, &set->package_pool);
  1129 	return razor_package_iterator_create_with_index(set, index);
  1130 }
  1131 
  1132 static struct list *
  1133 list_package_files(struct razor_set *set, struct list *r,
  1134 		   struct razor_entry *dir, uint32_t end,
  1135 		   char *prefix)
  1136 {
  1137 	struct razor_entry *e, *f, *entries;
  1138 	uint32_t next, file;
  1139 	char *pool;
  1140 	int len;
  1141 	
  1142 	entries = (struct razor_entry *) set->files.data;
  1143 	pool = set->string_pool.data;
  1144 
  1145 	e = entries + dir->start;
  1146 	do {
  1147 		if (entries + r->data == e) {
  1148 			printf("%s/%s\n", prefix, pool + e->name);
  1149 			r = list_next(r);
  1150 			if (!r)
  1151 				return NULL;
  1152 			if (r->data >= end)
  1153 				return r;
  1154 		}
  1155 	} while (!((e++)->flags & RAZOR_ENTRY_LAST));
  1156 
  1157 	e = entries + dir->start;
  1158 	do {
  1159 		if (e->start == 0)
  1160 			continue;
  1161 
  1162 		if (e->flags & RAZOR_ENTRY_LAST)
  1163 			next = end;
  1164 		else {
  1165 			f = e + 1; 
  1166 			while (f->start == 0 && !(f->flags & RAZOR_ENTRY_LAST))
  1167 				f++;
  1168 			if (f->start == 0)
  1169 				next = end;
  1170 			else
  1171 				next = f->start;
  1172 		}
  1173 
  1174 		file = r->data;
  1175 		if (e->start <= file && file < next) {
  1176 			len = strlen(prefix);
  1177 			prefix[len] = '/';
  1178 			strcpy(prefix + len + 1, pool + e->name);
  1179 			r = list_package_files(set, r, e, next, prefix);
  1180 			prefix[len] = '\0';
  1181 		}
  1182 	} while (!((e++)->flags & RAZOR_ENTRY_LAST) && r != NULL);
  1183 
  1184 	return r;
  1185 }
  1186 
  1187 void
  1188 razor_set_list_package_files(struct razor_set *set, const char *name)
  1189 {
  1190 	struct razor_package *package;
  1191 	struct list *r;
  1192 	uint32_t end;
  1193 	char buffer[512];
  1194 
  1195 	package = razor_set_get_package(set, name);
  1196 
  1197 	r = list_first(&package->files, &set->file_pool);
  1198 	end = set->files.size / sizeof (struct razor_entry);
  1199 	buffer[0] = '\0';
  1200 	list_package_files(set, r, set->files.data, end, buffer);
  1201 }
  1202 
  1203 static void
  1204 razor_set_validate(struct razor_set *set, struct array *unsatisfied)
  1205 {
  1206 	struct razor_property *r, *p, *end;
  1207 	uint32_t *u;
  1208 	char *pool;
  1209 
  1210 	end = set->properties.data + set->properties.size;
  1211 	pool = set->string_pool.data;
  1212 	
  1213 	for (r = set->properties.data, p = r; r < end; r++) {
  1214 		if (r->type != RAZOR_PROPERTY_REQUIRES)
  1215 			continue;
  1216 
  1217 		p = r;
  1218 		while (p < end && p->name == r->name &&
  1219 		       p->type == r->type)
  1220 			p++;
  1221 
  1222 		/* If there is more than one version of a provides,
  1223 		 * seek to the end for the highest version. */
  1224 		/* FIXME: This doesn't work if we have a series of
  1225 		 * requires a = 1, provides a = 1, requires a = 2,
  1226 		 * provides a = 2, as the kernel and kernel-devel
  1227 		 * does.*/
  1228 		while (p + 1 < end && p->name == (p + 1)->name &&
  1229 		       p->type == (p + 1)->type)
  1230 			p++;
  1231 
  1232 		/* FIXME: We need to track property flags (<, <=, =
  1233 		 * etc) to properly determine if a requires is
  1234 		 * satisfied.  The current code doesn't track that the
  1235 		 * requires a = 1 isn't satisfied by a = 2 provides. */
  1236 
  1237 		if (p == end ||
  1238 		    p->type != RAZOR_PROPERTY_PROVIDES ||
  1239 		    r->name != p->name ||
  1240 		    versioncmp(&pool[r->version], &pool[p->version]) > 0) {
  1241 			/* FIXME: We ignore file requires for now. */
  1242 			if (pool[r->name] == '/')
  1243 				continue;
  1244 			u = array_add(unsatisfied, sizeof *u);
  1245 			*u = r - (struct razor_property *) set->properties.data;
  1246 		}
  1247 	}
  1248 }
  1249 
  1250 void
  1251 razor_set_list_unsatisfied(struct razor_set *set)
  1252 {
  1253 	struct array unsatisfied;
  1254 	struct razor_property *properties, *r;
  1255 	uint32_t *u, *end;
  1256 	char *pool;
  1257 
  1258 	array_init(&unsatisfied);
  1259 	razor_set_validate(set, &unsatisfied);
  1260 
  1261 	end = unsatisfied.data + unsatisfied.size;
  1262 	properties = set->properties.data;
  1263 	pool = set->string_pool.data;
  1264 
  1265 	for (u = unsatisfied.data; u < end; u++) {
  1266 		r = properties + *u;
  1267 		if (pool[r->version] == '\0')
  1268 			printf("%ss not satisfied\n",
  1269 			       &pool[r->name]);
  1270 		else
  1271 			printf("%s-%s not satisfied\n",
  1272 			       &pool[r->name],
  1273 			       &pool[r->version]);
  1274 	}
  1275 
  1276 	array_release(&unsatisfied);
  1277 }
  1278 
  1279 #define UPSTREAM_SOURCE 0x80
  1280 
  1281 struct source {
  1282 	struct razor_set *set;
  1283 	uint32_t *property_map;
  1284 	uint32_t *file_map;
  1285 };
  1286 
  1287 struct razor_merger {
  1288 	struct razor_set *set;
  1289 	struct hashtable table;
  1290 	struct source source1;
  1291 	struct source source2;
  1292 };
  1293 
  1294 static struct razor_merger *
  1295 razor_merger_create(struct razor_set *set1, struct razor_set *set2)
  1296 {
  1297 	struct razor_merger *merger;
  1298 	int count;
  1299 	size_t size;
  1300 
  1301 	merger = zalloc(sizeof *merger);
  1302 	merger->set = razor_set_create();
  1303 	hashtable_init(&merger->table, &merger->set->string_pool);
  1304 
  1305 	merger->source1.set = set1;
  1306 	count = set1->properties.size / sizeof (struct razor_property);
  1307 	size = count * sizeof merger->source1.property_map[0];
  1308 	merger->source1.property_map = zalloc(size);
  1309 	count = set1->files.size / sizeof (struct razor_entry);
  1310 	size = count * sizeof merger->source1.file_map[0];
  1311 	merger->source1.file_map = zalloc(size);
  1312 
  1313 	merger->source2.set = set2;
  1314 	count = set2->properties.size / sizeof (struct razor_property);
  1315 	size = count * sizeof merger->source2.property_map[0];
  1316 	merger->source2.property_map = zalloc(size);
  1317 	count = set2->files.size / sizeof (struct razor_entry);
  1318 	size = count * sizeof merger->source2.file_map[0];
  1319 	merger->source2.file_map = zalloc(size);
  1320 
  1321 	return merger;
  1322 }
  1323 
  1324 static void
  1325 add_package(struct razor_merger *merger,
  1326 	    struct razor_package *package, struct source *source,
  1327 	    uint32_t flags)
  1328 {
  1329 	char *pool;
  1330 	struct list *r;
  1331 	struct razor_package *p;
  1332 
  1333 	pool = source->set->string_pool.data;
  1334 	p = array_add(&merger->set->packages, sizeof *p);
  1335 	p->name = hashtable_tokenize(&merger->table, &pool[package->name]);
  1336 	p->flags = flags;
  1337 	p->version = hashtable_tokenize(&merger->table,
  1338 					&pool[package->version]);
  1339 
  1340 	p->properties = package->properties;
  1341 	r = list_first(&package->properties, &source->set->property_pool);
  1342 	while (r) {
  1343 		source->property_map[r->data] = 1;
  1344 		r = list_next(r);
  1345 	}
  1346 
  1347 	p->files = package->files;
  1348 	r = list_first(&package->files, &source->set->file_pool);
  1349 	while (r) {
  1350 		source->file_map[r->data] = 1;
  1351 		r = list_next(r);
  1352 	}
  1353 }
  1354 
  1355 static uint32_t
  1356 add_property(struct razor_merger *merger,
  1357 	     const char *name, enum razor_version_relation relation,
  1358 	     const char *version, int type)
  1359 {
  1360 	struct razor_property *p;
  1361 
  1362 	p = array_add(&merger->set->properties, sizeof *p);
  1363 	p->name = hashtable_tokenize(&merger->table, name);
  1364 	p->flags = 0;
  1365 	p->type = type;
  1366 	p->relation = relation;
  1367 	p->version = hashtable_tokenize(&merger->table, version);
  1368 
  1369 	return p - (struct razor_property *) merger->set->properties.data;
  1370 }
  1371 
  1372 static void
  1373 merge_properties(struct razor_merger *merger)
  1374 {
  1375 	struct razor_property *p1, *p2;
  1376 	struct razor_set *set1, *set2;
  1377 	uint32_t *map1, *map2;
  1378 	int i, j, cmp, count1, count2;
  1379 	char *pool1, *pool2;
  1380 
  1381 	set1 = merger->source1.set;
  1382 	set2 = merger->source2.set;
  1383 	map1 = merger->source1.property_map;
  1384 	map2 = merger->source2.property_map;
  1385 
  1386 	i = 0;
  1387 	j = 0;
  1388 	pool1 = set1->string_pool.data;
  1389 	pool2 = set2->string_pool.data;
  1390 
  1391 	count1 = set1->properties.size / sizeof *p1;
  1392 	count2 = set2->properties.size / sizeof *p2;
  1393 	while (i < count1 || j < count2) {
  1394 		if (i < count1 && map1[i] == 0) {
  1395 			i++;
  1396 			continue;
  1397 		}
  1398 		if (j < count2 && map2[j] == 0) {
  1399 			j++;
  1400 			continue;
  1401 		}
  1402 		p1 = (struct razor_property *) set1->properties.data + i;
  1403 		p2 = (struct razor_property *) set2->properties.data + j;
  1404 		if (i < count1 && j < count2)
  1405 			cmp = strcmp(&pool1[p1->name], &pool2[p2->name]);
  1406 		else if (i < count1)
  1407 			cmp = -1;
  1408 		else
  1409 			cmp = 1;
  1410 		if (cmp == 0)
  1411 			cmp = p1->type - p2->type;
  1412 		if (cmp == 0)
  1413 			cmp = p1->relation - p2->relation;
  1414 		if (cmp == 0)
  1415 			cmp = versioncmp(&pool1[p1->version],
  1416 					 &pool2[p2->version]);
  1417 		if (cmp < 0) {
  1418 			map1[i++] = add_property(merger,
  1419 						 &pool1[p1->name],
  1420 						 p1->relation,
  1421 						 &pool1[p1->version],
  1422 						 p1->type);
  1423 		} else if (cmp > 0) {
  1424 			map2[j++] = add_property(merger,
  1425 						 &pool2[p2->name],
  1426 						 p2->relation,
  1427 						 &pool2[p2->version],
  1428 						 p2->type);
  1429 		} else  {
  1430 			map1[i++] = map2[j++] = add_property(merger,
  1431 							     &pool1[p1->name],
  1432 							     p1->relation,
  1433 							     &pool1[p1->version],
  1434 							     p1->type);
  1435 		}
  1436 	}
  1437 }
  1438 
  1439 static void
  1440 emit_properties(struct list_head *properties, struct array *source_pool,
  1441 		uint32_t *map, struct array *pool)
  1442 {
  1443 	uint32_t r;
  1444 	struct list *p, *q;
  1445 
  1446 	r = pool->size / sizeof *q;
  1447 	p = list_first(properties, source_pool);
  1448 	while (p) {
  1449 		q = array_add(pool, sizeof *q);
  1450 		q->data = map[p->data];
  1451 		q->flags = p->flags;
  1452 		p = list_next(p);
  1453 	}
  1454 
  1455 	list_set_ptr(properties, r);
  1456 }
  1457 
  1458 static uint32_t
  1459 add_file(struct razor_merger *merger, const char *name)
  1460 {
  1461 	struct razor_entry *e;
  1462 
  1463 	e = array_add(&merger->set->files, sizeof *e);
  1464 	e->name = hashtable_tokenize(&merger->table, name);
  1465 	e->flags = 0;
  1466 	e->start = 0;
  1467 
  1468 	return e - (struct razor_entry *)merger->set->files.data;
  1469 }
  1470 
  1471 /* FIXME. Blah */
  1472 static int
  1473 fix_file_map(uint32_t *map,
  1474 	     struct razor_entry *files,
  1475 	     struct razor_entry *top)
  1476 {
  1477 	uint32_t e;
  1478 	int found_file = 0;
  1479 
  1480 	e = top->start;
  1481 	do {
  1482 		if (files[e].start)
  1483 			fix_file_map(map, files, &files[e]);
  1484 		if (map[e])
  1485 			found_file = 1;
  1486 	} while (!(files[e++].flags & RAZOR_ENTRY_LAST));
  1487 
  1488 	if (found_file)
  1489 		map[top - files] = 1;
  1490 	return found_file;
  1491 }
  1492 
  1493 struct merge_directory {
  1494 	uint32_t merged, dir1, dir2;
  1495 };
  1496 
  1497 static void
  1498 merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
  1499 {
  1500 	struct razor_entry *root1, *root2, *mroot, *e1, *e2;
  1501 	struct razor_set *set1, *set2;
  1502 	struct array merge_stack;
  1503 	struct merge_directory *child_md, *end_md;
  1504 	uint32_t *map1, *map2, start, last;
  1505 	int cmp;
  1506 	char *pool1, *pool2;
  1507 
  1508 	set1 = merger->source1.set;
  1509 	set2 = merger->source2.set;
  1510 	map1 = merger->source1.file_map;
  1511 	map2 = merger->source2.file_map;
  1512 	pool1 = set1->string_pool.data;
  1513 	pool2 = set2->string_pool.data;
  1514 	root1 = (struct razor_entry *) set1->files.data;
  1515 	root2 = (struct razor_entry *) set2->files.data;
  1516 
  1517 	array_init(&merge_stack);
  1518 
  1519 	start = merger->set->files.size / sizeof (struct razor_entry);
  1520 	last = 0;
  1521 	e1 = md->dir1 ? root1 + md->dir1 : NULL;
  1522 	e2 = md->dir2 ? root2 + md->dir2 : NULL;
  1523 	while (e1 || e2) {
  1524 		if (!e2 && !map1[e1 - root1]) {
  1525 			if ((e1++)->flags & RAZOR_ENTRY_LAST)
  1526 				e1 = NULL;
  1527 			continue;
  1528 		}
  1529 		if (!e1 && !map2[e2 - root2]) {
  1530 			if ((e2++)->flags & RAZOR_ENTRY_LAST)
  1531 				e2 = NULL;
  1532 			continue;
  1533 		}
  1534 		if (e1 && !map1[e1 - root1] &&
  1535 		    e2 && !map1[e2 - root2]) {
  1536 			if ((e1++)->flags & RAZOR_ENTRY_LAST)
  1537 				e1 = NULL;
  1538 			if ((e2++)->flags & RAZOR_ENTRY_LAST)
  1539 				e2 = NULL;
  1540 			continue;
  1541 		}
  1542 
  1543 		if (!e1)
  1544 			cmp = 1;
  1545 		else if (!e2)
  1546 			cmp = -1;
  1547 		else {
  1548 			cmp = strcmp (&pool1[e1->name],
  1549 				      &pool2[e2->name]);
  1550 		}
  1551 
  1552 		if (cmp < 0) {
  1553 			if (map1[e1 - root1]) {
  1554 				map1[e1 - root1] = last =
  1555 					add_file(merger, &pool1[e1->name]);
  1556 				if (e1->start) {
  1557 					child_md = array_add(&merge_stack, sizeof (struct merge_directory));
  1558 					child_md->merged = last;
  1559 					child_md->dir1 = e1->start;
  1560 					child_md->dir2 = 0;
  1561 				}
  1562 			}
  1563 			if ((e1++)->flags & RAZOR_ENTRY_LAST)
  1564 				e1 = NULL;
  1565 		} else if (cmp > 0) {
  1566 			if (map2[e2 - root2]) {
  1567 				map2[e2 - root2] = last =
  1568 					add_file(merger, &pool2[e2->name]);
  1569 				if (e2->start) {
  1570 					child_md = array_add(&merge_stack, sizeof (struct merge_directory));
  1571 					child_md->merged = last;
  1572 					child_md->dir1 = 0;
  1573 					child_md->dir2 = e2->start;
  1574 				}
  1575 			}
  1576 			if ((e2++)->flags & RAZOR_ENTRY_LAST)
  1577 				e2 = NULL;
  1578 		} else {
  1579 			map1[e1 - root1] = map2[e2- root2] = last =
  1580 				add_file(merger, &pool1[e1->name]);
  1581 			if (e1->start || e2->start) {
  1582 				child_md = array_add(&merge_stack, sizeof (struct merge_directory));
  1583 				child_md->merged = last;
  1584 				child_md->dir1 = e1->start;
  1585 				child_md->dir2 = e2->start;
  1586 			}
  1587 			if ((e1++)->flags & RAZOR_ENTRY_LAST)
  1588 				e1 = NULL;
  1589 			if ((e2++)->flags & RAZOR_ENTRY_LAST)
  1590 				e2 = NULL;
  1591 		}
  1592 	}
  1593 
  1594 	mroot = (struct razor_entry *)merger->set->files.data;
  1595 	if (last) {
  1596 		mroot[last].flags = RAZOR_ENTRY_LAST;
  1597 		mroot[md->merged].start = start;
  1598 	} else
  1599 		mroot[md->merged].start = 0;
  1600 
  1601 	end_md = merge_stack.data + merge_stack.size;
  1602 	for (child_md = merge_stack.data; child_md < end_md; child_md++)
  1603 		merge_one_directory(merger, child_md);
  1604 	array_release(&merge_stack);
  1605 }
  1606 
  1607 static void
  1608 merge_files(struct razor_merger *merger)
  1609 {
  1610 	struct razor_entry *root;
  1611 	struct merge_directory md;
  1612 	uint32_t *map1, *map2;
  1613 
  1614 	map1 = merger->source1.file_map;
  1615 	map2 = merger->source2.file_map;
  1616 
  1617 	md.merged = add_file(merger, "");
  1618 
  1619 	if (merger->source1.set->files.size) {
  1620 		root = (struct razor_entry *) merger->source1.set->files.data;
  1621 		if (root->start)
  1622 			fix_file_map(map1, root, root);
  1623 		md.dir1 = root->start;
  1624 	} else
  1625 		md.dir1 = 0;
  1626 
  1627 	if (merger->source2.set->files.size) {
  1628 		root = (struct razor_entry *) merger->source2.set->files.data;
  1629 		if (root->start)
  1630 			fix_file_map(map2, root, root);
  1631 		md.dir2 = root->start;
  1632 	} else
  1633 		md.dir2 = 0;
  1634 
  1635 	merge_one_directory(merger, &md);
  1636 }
  1637 
  1638 static void
  1639 emit_files(struct list_head *files, struct array *source_pool,
  1640 	   uint32_t *map, struct array *pool)
  1641 {
  1642 	uint32_t r;
  1643 	struct list *p, *q;
  1644 
  1645 	r = pool->size / sizeof *q;
  1646 	p = list_first(files, source_pool);
  1647 	while (p) {
  1648 		q = array_add(pool, sizeof *q);
  1649 		q->data = map[p->data];
  1650 		q->flags = p->flags;
  1651 		p = list_next(p);
  1652 	}
  1653 
  1654 	list_set_ptr(files, r);
  1655 }
  1656 
  1657 /* Rebuild property->packages maps.  We can't just remap these, as a
  1658  * property may have lost or gained a number of packages.  Allocate an
  1659  * array per property and loop through the packages and add them to
  1660  * the arrays for their properties. */
  1661 static void
  1662 rebuild_property_package_lists(struct razor_set *set)
  1663 {
  1664 	struct array *pkgs, *a;
  1665 	struct razor_package *pkg, *pkg_end;
  1666 	struct razor_property *prop, *prop_end;
  1667 	struct list *r;
  1668 	uint32_t *q;
  1669 	int count;
  1670 
  1671 	count = set->properties.size / sizeof (struct razor_property);
  1672 	pkgs = zalloc(count * sizeof *pkgs);
  1673 	pkg_end = set->packages.data + set->packages.size;
  1674 
  1675 	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
  1676 		r = list_first(&pkg->properties, &set->property_pool);
  1677 		while (r) {
  1678 			q = array_add(&pkgs[r->data], sizeof *q);
  1679 			*q = pkg - (struct razor_package *) set->packages.data;
  1680 			r = list_next(r);
  1681 		}
  1682 	}
  1683 
  1684 	prop_end = set->properties.data + set->properties.size;
  1685 	a = pkgs;
  1686 	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
  1687 		list_set_array(&prop->packages, &set->package_pool, a, 0);
  1688 		array_release(a);
  1689 	}
  1690 	free(pkgs);
  1691 }
  1692 
  1693 static void
  1694 rebuild_file_package_lists(struct razor_set *set)
  1695 {
  1696 	struct array *pkgs, *a;
  1697 	struct razor_package *pkg, *pkg_end;
  1698 	struct razor_entry *entry, *entry_end;
  1699 	struct list *r;
  1700 	uint32_t *q;
  1701 	int count;
  1702 
  1703 	count = set->files.size / sizeof (struct razor_entry);
  1704 	pkgs = zalloc(count * sizeof *pkgs);
  1705 	pkg_end = set->packages.data + set->packages.size;
  1706 
  1707 	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
  1708 		r = list_first(&pkg->files, &set->file_pool);
  1709 		while (r) {
  1710 			q = array_add(&pkgs[r->data], sizeof *q);
  1711 			*q = pkg - (struct razor_package *) set->packages.data;
  1712 			r = list_next(r);
  1713 		}
  1714 	}
  1715 
  1716 	entry_end = set->files.data + set->files.size;
  1717 	a = pkgs;
  1718 	for (entry = set->files.data; entry < entry_end; entry++, a++) {
  1719 		list_set_array(&entry->packages, &set->package_pool, a, 0);
  1720 		array_release(a);
  1721 	}
  1722 	free(pkgs);
  1723 }
  1724 
  1725 static struct razor_set *
  1726 razor_merger_finish(struct razor_merger *merger)
  1727 {
  1728 	struct razor_set *result;
  1729 	struct razor_package *p, *pend;
  1730 
  1731 	/* As we built the package list, we filled out a bitvector of
  1732 	 * the properties that are referenced by the packages in the
  1733 	 * new set.  Now we do a parallel loop through the properties
  1734 	 * and emit those marked in the bit vector to the new set.  In
  1735 	 * the process, we update the bit vector to actually map from
  1736 	 * indices in the old property list to indices in the new
  1737 	 * property list for both sets. */
  1738 
  1739 	merge_properties(merger);
  1740 	merge_files(merger);
  1741 
  1742 	/* Now we loop through the packages again and emit the
  1743 	 * property lists, remapped to point to the new properties. */
  1744 
  1745 	pend = merger->set->packages.data + merger->set->packages.size;
  1746 	for (p = merger->set->packages.data; p < pend; p++) {
  1747 		struct source *src;
  1748 
  1749 		if (p->flags & UPSTREAM_SOURCE)
  1750 			src = &merger->source2;
  1751 		else
  1752 			src = &merger->source1;
  1753 
  1754 		emit_properties(&p->properties,
  1755 				&src->set->property_pool,
  1756 				src->property_map,
  1757 				&merger->set->property_pool);
  1758 		emit_files(&p->files,
  1759 			   &src->set->file_pool,
  1760 			   src->file_map,
  1761 			   &merger->set->file_pool);
  1762 		p->flags &= ~UPSTREAM_SOURCE;
  1763 	}
  1764 
  1765 	rebuild_property_package_lists(merger->set);
  1766 	rebuild_file_package_lists(merger->set);
  1767 
  1768 	result = merger->set;
  1769 	hashtable_release(&merger->table);
  1770 	free(merger);
  1771 
  1772 	return result;
  1773 }
  1774 
  1775 /* The diff order matters.  We should sort the packages so that a
  1776  * REMOVE of a package comes before the INSTALL, and so that all
  1777  * requires for a package have been installed before the package.
  1778  **/
  1779 
  1780 void
  1781 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
  1782 	       razor_package_callback_t callback, void *data)
  1783 {
  1784 	struct razor_package_iterator *pi1, *pi2;
  1785 	struct razor_package *p1, *p2;
  1786 	const char *name1, *name2, *version1, *version2;
  1787 	int res;
  1788 
  1789 	pi1 = razor_package_iterator_create(set);
  1790 	pi2 = razor_package_iterator_create(upstream);
  1791 
  1792 	razor_package_iterator_next(pi1, &p1, &name1, &version1);
  1793 	razor_package_iterator_next(pi2, &p2, &name2, &version2);
  1794 
  1795 	while (p1 || p2) {
  1796 		if (p1 && p2) {
  1797 			res = strcmp(name1, name2);
  1798 			if (res == 0)
  1799 				res = versioncmp(version1, version2);
  1800 		} else {
  1801 			res = 0;
  1802 		}
  1803 
  1804 		if (p2 == NULL || res < 0)
  1805 			callback(name1, version1, NULL, data);
  1806 		else if (p1 == NULL || res > 0)
  1807 			callback(name2, NULL, version2, data);
  1808 
  1809 		if (p1 != NULL && res <= 0)
  1810 			razor_package_iterator_next(pi1, &p1,
  1811 						    &name1, &version1);
  1812 		if (p2 != NULL && res >= 0)
  1813 			razor_package_iterator_next(pi2, &p2,
  1814 						    &name2, &version2);
  1815 	}
  1816 
  1817 	razor_package_iterator_destroy(pi1);
  1818 	razor_package_iterator_destroy(pi2);
  1819 }
  1820 
  1821 
  1822 struct razor_transaction_resolver {
  1823 	struct razor_set *system, *upstream;
  1824 	struct bitarray syspkgs, uppkgs;
  1825 	struct array packages;
  1826 	int errors;
  1827 };
  1828 
  1829 static int
  1830 package_in_set(void *package, struct razor_set *set)
  1831 {
  1832 	return package >= set->packages.data &&
  1833 		package < set->packages.data + set->packages.size;
  1834 }
  1835 
  1836 static int
  1837 property_in_set(void *property, struct razor_set *set)
  1838 {
  1839 	return property >= set->properties.data &&
  1840 		property < set->properties.data + set->properties.size;
  1841 }
  1842 
  1843 static int
  1844 compare_transaction_packages(const void *one, const void *two)
  1845 {
  1846 	const struct razor_transaction_package *tp1 = one;
  1847 	const struct razor_transaction_package *tp2 = two;
  1848 
  1849 	return strcmp(tp1->name, tp2->name);
  1850 }
  1851 
  1852 static void
  1853 find_packages(struct razor_transaction_resolver *trans,
  1854 	      int update_count, const char **update_packages,
  1855 	      int remove_count, const char **remove_packages)
  1856 {
  1857 	struct razor_package *sp, *spkgs, *up, *upkgs, *send, *uend;
  1858 	struct razor_transaction_package *packages, *tp;
  1859 	const char *spool, *upool;
  1860 	int i;
  1861 
  1862 	spkgs = trans->system->packages.data;
  1863 	send = trans->system->packages.data + trans->system->packages.size;
  1864 	spool = trans->system->string_pool.data;
  1865 	upkgs = trans->upstream->packages.data;
  1866 	uend = trans->upstream->packages.data + trans->upstream->packages.size;
  1867 	upool = trans->upstream->string_pool.data;
  1868 
  1869 	for (i = 0; i < update_count; i++) {
  1870 		tp = array_add(&trans->packages, sizeof *tp);
  1871 		memset(tp, 0, sizeof *tp);
  1872 		tp->name = update_packages[i];
  1873 		tp->state = RAZOR_PACKAGE_INSTALL;
  1874 	}
  1875 	for (i = 0; i < remove_count; i++) {
  1876 		tp = array_add(&trans->packages, sizeof *tp);
  1877 		memset(tp, 0, sizeof *tp);
  1878 		tp->name = remove_packages[i];
  1879 		tp->state = RAZOR_PACKAGE_REMOVE;
  1880 	}
  1881 	qsort(trans->packages.data, update_count + remove_count,
  1882 	      sizeof *tp, compare_transaction_packages);
  1883 	packages = trans->packages.data;
  1884 
  1885 	sp = spkgs;
  1886 	up = upkgs;
  1887 	for (i = 0; i < update_count + remove_count; i++) {
  1888 		while (sp < send && strcmp(&spool[sp->name], packages[i].name) < 0)
  1889 			sp++;
  1890 		while (up < uend && strcmp(&upool[up->name], packages[i].name) < 0)
  1891 			up++;
  1892 
  1893 		if (packages[i].state == RAZOR_PACKAGE_REMOVE) {
  1894 			if (sp < send && strcmp(packages[i].name, &spool[sp->name]) == 0) {
  1895 				packages[i].old_package = sp;
  1896 				packages[i].name = &spool[sp->name];
  1897 				packages[i].old_version = &spool[sp->version];
  1898 				bitarray_set(&trans->syspkgs, sp - spkgs, 0);
  1899 			} else {
  1900 				packages[i].name = strdup(packages[i].name);
  1901 				packages[i].state = RAZOR_PACKAGE_REMOVE_NOT_INSTALLED;
  1902 				trans->errors++;
  1903 			}
  1904 		} else {
  1905 			if (up < uend && strcmp(packages[i].name, &upool[up->name]) == 0) {
  1906 				packages[i].new_package = up;
  1907 				packages[i].name = &upool[up->name];
  1908 				packages[i].new_version = &upool[up->version];
  1909 				if (sp < send && strcmp(packages[i].name, &spool[sp->name]) == 0) {
  1910 					packages[i].old_package = sp;
  1911 					packages[i].old_version = &spool[sp->version];
  1912 					if (versioncmp(&spool[sp->version], &upool[up->version]) >= 0) {
  1913 						packages[i].state = RAZOR_PACKAGE_UP_TO_DATE;
  1914 						trans->errors++;
  1915 						continue;
  1916 					}
  1917 					bitarray_set(&trans->syspkgs, sp - spkgs, 0);
  1918 				}
  1919 				bitarray_set(&trans->uppkgs, up - upkgs, 1);
  1920 			} else {
  1921 				packages[i].name = strdup(packages[i].name);
  1922 				packages[i].state = RAZOR_PACKAGE_INSTALL_UNAVAILABLE;
  1923 				trans->errors++;
  1924 			}
  1925 		}
  1926 	}
  1927 }
  1928 
  1929 static void
  1930 find_all_packages(struct razor_transaction_resolver *trans)
  1931 {
  1932 	struct razor_transaction_package *tp;
  1933 	struct razor_package *sp, *spkgs, *send, *up, *upkgs, *uend;
  1934 	const char *spool, *upool;
  1935 
  1936 	spkgs = trans->system->packages.data;
  1937 	send = trans->system->packages.data + trans->system->packages.size;
  1938 	spool = trans->system->string_pool.data;
  1939 	up = upkgs = trans->upstream->packages.data;
  1940 	uend = trans->upstream->packages.data + trans->upstream->packages.size;
  1941 	upool = trans->upstream->string_pool.data;
  1942 
  1943 	for (sp = spkgs; sp < send; sp++) {
  1944 		while (up < uend && strcmp(&spool[sp->name], &upool[up->name]) > 0)
  1945 			up++;
  1946 		if (strcmp(&spool[sp->name], &upool[up->name]) == 0) {
  1947 			tp = array_add(&trans->packages, sizeof *tp);
  1948 			memset(tp, 0, sizeof *tp);
  1949 			tp->old_package = sp;
  1950 			tp->new_package = up;
  1951 			tp->name = &upool[up->name];
  1952 			tp->old_version = &spool[sp->version];
  1953 			tp->new_version = &upool[up->version];
  1954 			tp->state = RAZOR_PACKAGE_INSTALL;
  1955 			bitarray_set(&trans->uppkgs, up - upkgs, 1);
  1956 			bitarray_set(&trans->syspkgs, sp - spkgs, 0);
  1957 		}
  1958 	}
  1959 }
  1960 
  1961 static int
  1962 provider_satisfies_requirement(struct razor_property *provider,
  1963 			       const char *provider_strings,
  1964 			       struct razor_property *requirement,
  1965 			       const char *requirement_strings)
  1966 {
  1967 	int cmp, len;
  1968 	const char *provided = &provider_strings[provider->version];
  1969 	const char *required = &requirement_strings[requirement->version];
  1970 
  1971 	if (!*required)
  1972 		return 1;
  1973 
  1974 	cmp = versioncmp(provided, required);
  1975 
  1976 	switch (requirement->relation) {
  1977 	case RAZOR_VERSION_LESS:
  1978 		return cmp < 0;
  1979 
  1980 	case RAZOR_VERSION_LESS_OR_EQUAL:
  1981 		if (cmp <= 0)
  1982 			return 1;
  1983 		/* fall through: FIXME, make sure this is correct */
  1984 
  1985 	case RAZOR_VERSION_EQUAL:
  1986 		if (cmp == 0)
  1987 			return 1;
  1988 
  1989 		/* "foo == 1.1" is satisfied by "foo 1.1-2" */
  1990 		len = strlen(required);
  1991 		if (!strncmp(required, provided, len) && provided[len] == '-')
  1992 			return 1;
  1993 		return 0;
  1994 
  1995 	case RAZOR_VERSION_GREATER_OR_EQUAL:
  1996 		return cmp >= 0;
  1997 
  1998 	case RAZOR_VERSION_GREATER:
  1999 		return cmp > 0;
  2000 	}
  2001 
  2002 	/* shouldn't happen */
  2003 	return 0;
  2004 }
  2005 
  2006 static struct razor_package *
  2007 find_package_for_file(struct razor_set *set, struct bitarray *pkgbits,
  2008 		      const char *filename, int installed)
  2009 {
  2010 	struct razor_package *pkgs = set->packages.data;
  2011 	struct razor_entry *entry;
  2012 	struct list *p;
  2013 
  2014 	if (filename[0] != '/')
  2015 		return 0;
  2016 
  2017 	entry = find_entry(set, set->files.data, filename);
  2018 	if (!entry)
  2019 		return 0;
  2020 
  2021 	for (p = list_first(&entry->packages, &set->package_pool); p; p = list_next(p)) {
  2022 		if (bitarray_get(pkgbits, p->data) == installed)
  2023 			return &pkgs[p->data];
  2024 	}
  2025 	return NULL;
  2026 }
  2027 
  2028 static struct razor_package *
  2029 find_installed_package_for_file(struct razor_transaction_resolver *trans,
  2030 				const char *filename)
  2031 {
  2032 	struct razor_package *pkg;
  2033 
  2034 	pkg = find_package_for_file(trans->system, &trans->syspkgs,
  2035 				    filename, 1);
  2036 	if (!pkg)
  2037 		pkg = find_package_for_file(trans->upstream, &trans->uppkgs,
  2038 					    filename, 1);
  2039 	return pkg;
  2040 }
  2041 
  2042 static struct razor_package *
  2043 find_uninstalled_package_for_file(struct razor_transaction_resolver *trans,
  2044 				  const char *filename)
  2045 {
  2046 	struct razor_package *pkg;
  2047 
  2048 	pkg = find_package_for_file(trans->upstream, &trans->uppkgs,
  2049 				    filename, 0);
  2050 	if (!pkg)
  2051 		pkg = find_package_for_file(trans->system, &trans->syspkgs,
  2052 					    filename, 0);
  2053 	return pkg;
  2054 }
  2055 
  2056 static struct razor_property *
  2057 skip_to_matching_property(struct razor_transaction_resolver *trans,
  2058 			  struct razor_property *match,
  2059 			  struct razor_property *prop)
  2060 {
  2061 	struct razor_set *mset, *pset;
  2062 	const char *ppool, *mpool;
  2063 	struct razor_property *prop_end;
  2064 
  2065 	if (property_in_set(match, trans->system))
  2066 		mset = trans->system;
  2067 	else
  2068 		mset = trans->upstream;
  2069 
  2070 	if (property_in_set(prop, trans->system))
  2071 		pset = trans->system;
  2072 	else if (property_in_set(prop, trans->upstream))
  2073 		pset = trans->upstream;
  2074 	else
  2075 		return prop;
  2076 
  2077 	prop_end = pset->properties.data + pset->properties.size;
  2078 	ppool = pset->string_pool.data;
  2079 	mpool = mset->string_pool.data;
  2080 
  2081 	while (prop < prop_end &&
  2082 	       strcmp(&ppool[prop->name], &mpool[match->name]) < 0)
  2083 		prop++;
  2084 	return prop;
  2085 }
  2086 
  2087 static struct razor_package *
  2088 find_package_matching(struct razor_transaction_resolver *trans, int installed,
  2089 		      struct razor_property *prop,
  2090 		      struct razor_property *req,
  2091 		      struct razor_set *req_set)
  2092 {
  2093 	struct razor_set *set;
  2094 	struct bitarray *pkgbits;
  2095 	struct razor_package *pkgs;
  2096 	struct razor_property *props, *prop_end;
  2097 	enum razor_property_type match_type;
  2098 	const char *pool;
  2099 	const char *rpool;
  2100 	int match_name = (req->type == RAZOR_PROPERTY_OBSOLETES);
  2101 	int match;
  2102 
  2103 	if (property_in_set(prop, trans->system)) {
  2104 		set = trans->system;
  2105 		pkgbits = &trans->syspkgs;
  2106 	} else if (property_in_set(prop, trans->upstream)) {
  2107 		set = trans->upstream;
  2108 		pkgbits = &trans->uppkgs;
  2109 	} else
  2110 		return NULL;
  2111 
  2112 	if (!req_set) {
  2113 		if (property_in_set(req, trans->system))
  2114 			req_set = trans->system;
  2115 		else
  2116 			req_set = trans->upstream;
  2117 	}
  2118 	rpool = req_set->string_pool.data;
  2119 
  2120 	if (req->type == RAZOR_PROPERTY_PROVIDES)
  2121 		match_type = RAZOR_PROPERTY_CONFLICTS;
  2122 	else
  2123 		match_type = RAZOR_PROPERTY_PROVIDES;
  2124 
  2125 	pkgs = set->packages.data;
  2126 	props = set->properties.data;
  2127 	prop_end = set->properties.data + set->properties.size;
  2128 	pool = set->string_pool.data;
  2129 
  2130 	/* Find first matching property */
  2131 	while (prop < prop_end &&
  2132 	       strcmp(&pool[prop->name], &rpool[req->name]) < 0)
  2133 		prop++;
  2134 	if (prop == prop_end ||
  2135 	    strcmp(&pool[prop->name], &rpool[req->name]) > 0)
  2136 		return NULL;
  2137 
  2138 	if (prop->type < match_type) {
  2139 		while (prop < prop_end && prop->type != match_type)
  2140 			prop++;
  2141 	} else {
  2142 		while (prop >= props && prop->type != match_type)
  2143 			prop--;
  2144 		while (prop > props + 1 && (prop - 1)->type == match_type)
  2145 			prop--;
  2146 	}
  2147 
  2148 	/* Scan matching properties */
  2149 	while (prop < prop_end && prop->type == match_type &&
  2150 	       strcmp(&pool[prop->name], &rpool[req->name]) == 0) {
  2151 		if (match_type == RAZOR_PROPERTY_PROVIDES)
  2152 			match = provider_satisfies_requirement(prop, pool, req, rpool);
  2153 		else
  2154 			match = provider_satisfies_requirement(req, rpool, prop, pool);
  2155 		if (match) {
  2156 			struct list *pkg;
  2157 
  2158 			for (pkg = list_first(&prop->packages, &set->package_pool); pkg; pkg = list_next(pkg)) {
  2159 				if (bitarray_get(pkgbits, pkg->data) != installed)
  2160 					continue;
  2161 				if (!match_name ||
  2162 				    strcmp(&pool[pkgs[pkg->data].name],
  2163 					   &rpool[req->name]) == 0)
  2164 					return &pkgs[pkg->data];
  2165 			}
  2166 		}
  2167 		prop++;
  2168 	}
  2169 
  2170 	return NULL;
  2171 }
  2172 
  2173 static struct razor_package *
  2174 find_installed_package_for_property(struct razor_transaction_resolver *trans,
  2175 				    struct razor_property *sys_start,
  2176 				    struct razor_property *up_start,
  2177 				    struct razor_property *req)
  2178 {
  2179 	struct razor_package *pkg;
  2180 
  2181 	pkg = find_package_matching(trans, 1, sys_start, req, NULL);
  2182 	if (!pkg)
  2183 		pkg = find_package_matching(trans, 1, up_start, req, NULL);
  2184 	return pkg;
  2185 }
  2186 
  2187 static struct razor_package *
  2188 find_uninstalled_package_for_property(struct razor_transaction_resolver *trans,
  2189 				      struct razor_property *sys_start,
  2190 				      struct razor_property *up_start,
  2191 				      struct razor_property *req)
  2192 {
  2193 	struct razor_package *pkg;
  2194 
  2195 	pkg = find_package_matching(trans, 0, up_start, req, NULL);
  2196 	if (!pkg)
  2197 		pkg = find_package_matching(trans, 0, sys_start, req, NULL);
  2198 	return pkg;
  2199 }
  2200 
  2201 /* FIXME */
  2202 static struct razor_package *
  2203 find_upgrade_for_installed_conflict(struct razor_transaction_resolver *trans,
  2204 				    struct razor_package *conflicting_pkg,
  2205 				    struct razor_property *prop)
  2206 {
  2207 	struct razor_package *upkgs, *up, *uend;
  2208 	struct razor_property *uprops;
  2209 	const char *spool, *upool;
  2210 	struct list *p;
  2211 
  2212 	up = upkgs = trans->upstream->packages.data;
  2213 	uend = trans->upstream->packages.data + trans->upstream->packages.size;
  2214 	upool = trans->upstream->string_pool.data;
  2215 	uprops = trans->upstream->properties.data;
  2216 	spool = trans->system->string_pool.data;
  2217 
  2218 	while (up < uend &&
  2219 	       strcmp(&upool[up->name], &spool[conflicting_pkg->name]) < 0)
  2220 		up++;
  2221 	if (up == uend || strcmp(&upool[up->name], &spool[conflicting_pkg->name]) != 0)
  2222 		return NULL;
  2223 
  2224 	for (p = list_first(&up->properties, &trans->upstream->property_pool); p; p = list_next(p)) {
  2225 		if (prop->type == RAZOR_PROPERTY_PROVIDES &&
  2226 		    uprops[p->data].type == RAZOR_PROPERTY_CONFLICTS &&
  2227 		    provider_satisfies_requirement(prop, upool, &uprops[p->data], upool))
  2228 			return NULL;
  2229 		else if (prop->type == RAZOR_PROPERTY_CONFLICTS &&
  2230 			 uprops[p->data].type == RAZOR_PROPERTY_PROVIDES &&
  2231 			 provider_satisfies_requirement(&uprops[p->data], upool, prop, upool))
  2232 			return NULL;
  2233 	}
  2234 	return up;
  2235 }
  2236 
  2237 /* FIXME */
  2238 static int
  2239 prop_is_being_installed(struct razor_transaction_resolver *trans,
  2240 			struct razor_property *prop)
  2241 {
  2242 	struct list *pkg;
  2243 
  2244 	for (pkg = list_first(&prop->packages, &trans->upstream->package_pool); pkg; pkg = list_next(pkg)) {
  2245 		if (bitarray_get(&trans->uppkgs, pkg->data))
  2246 			return 1;
  2247 	}
  2248 	return 0;
  2249 }
  2250 
  2251 static struct razor_transaction_package *
  2252 find_transaction_package(struct razor_transaction_resolver *trans,
  2253 			 const char *name)
  2254 {
  2255 	struct razor_transaction_package *packages;
  2256 	int count, i;
  2257 
  2258 	packages = trans->packages.data;
  2259 	count = trans->packages.size / sizeof *packages;
  2260 	for (i = 0; i < count; i++) {
  2261 		if (packages[i].name && !strcmp(packages[i].name, name))
  2262 			return &packages[i];
  2263 	}
  2264 	return NULL;
  2265 }
  2266 
  2267 static void
  2268 add_transaction_package(struct razor_transaction_resolver *trans,
  2269 			struct razor_package *new_package,
  2270 			struct razor_package *old_package,
  2271 			enum razor_transaction_package_state state,
  2272 			const char *req_package,
  2273 			struct razor_property *req_prop)
  2274 {
  2275 	struct razor_set *new_package_set, *old_package_set, *req_set;
  2276 	struct bitarray *newpkgbits, *oldpkgbits, *reqpkgbits;
  2277 	struct razor_transaction_package *tp, *already;
  2278 	const char *pool;
  2279 	struct razor_package *pkgs;
  2280 	struct list *pkg;
  2281 	int contradiction = 0;
  2282 
  2283 	if (package_in_set(new_package, trans->system)) {
  2284 		new_package_set = trans->system;
  2285 		newpkgbits = &trans->syspkgs;
  2286 	} else {
  2287 		new_package_set = trans->upstream;
  2288 		newpkgbits = &trans->uppkgs;
  2289 	}
  2290 	if (package_in_set(old_package, trans->system)) {
  2291 		old_package_set = trans->system;
  2292 		oldpkgbits = &trans->syspkgs;
  2293 	} else {
  2294 		old_package_set = trans->upstream;
  2295 		oldpkgbits = &trans->uppkgs;
  2296 	}
  2297 	if (property_in_set(req_prop, trans->system)) {
  2298 		req_set = trans->system;
  2299 		reqpkgbits = &trans->syspkgs;
  2300 	} else {
  2301 		req_set = trans->upstream;
  2302 		reqpkgbits = &trans->uppkgs;
  2303 	}
  2304 
  2305 	if (new_package) {
  2306 		pool = new_package_set->string_pool.data;
  2307 		already = find_transaction_package(trans, &pool[new_package->name]);
  2308 		if (already) {
  2309 			if (already->new_package == new_package) {
  2310 				/* Already taken care of */
  2311 				return;
  2312 			}
  2313 			/* Oops. We lose */
  2314 			if (state != RAZOR_PACKAGE_CONTRADICTION)
  2315 				contradiction = 1;
  2316 		}
  2317 	} else if (old_package) {
  2318 		pool = old_package_set->string_pool.data;
  2319 		already = find_transaction_package(trans, &pool[old_package->name]);
  2320 		if (already) {
  2321 			if (already->old_package == old_package) {
  2322 				/* Already taken care of */
  2323 				return;
  2324 			}
  2325 			/* Oops. We lose */
  2326 			if (state != RAZOR_PACKAGE_CONTRADICTION)
  2327 				contradiction = 1;
  2328 		}
  2329 	} else
  2330 		state = RAZOR_PACKAGE_UNSATISFIABLE;
  2331 
  2332 	tp = array_add(&trans->packages, sizeof *tp);
  2333 	memset(tp, 0, sizeof *tp);
  2334 
  2335 	if (new_package) {
  2336 		pool = new_package_set->string_pool.data;
  2337 		tp->new_package = new_package;
  2338 		tp->name = &pool[new_package->name];
  2339 		tp->new_version = &pool[new_package->version];
  2340 
  2341 		pkgs = new_package_set->packages.data;
  2342 		bitarray_set(newpkgbits, new_package - pkgs, 1);
  2343 	}
  2344 	if (old_package) {
  2345 		pool = old_package_set->string_pool.data;
  2346 		tp->old_package = old_package;
  2347 		tp->name = &pool[old_package->name];
  2348 		tp->old_version = &pool[old_package->version];
  2349 
  2350 		pkgs = old_package_set->packages.data;
  2351 		bitarray_set(oldpkgbits, old_package - pkgs, 0);
  2352 	}
  2353 
  2354 	tp->state = state;
  2355 	if (state != RAZOR_PACKAGE_INSTALL &&
  2356 	    state != RAZOR_PACKAGE_FORCED_UPDATE &&
  2357 	    state != RAZOR_PACKAGE_REMOVE &&
  2358 	    state != RAZOR_PACKAGE_OBSOLETED)
  2359 		trans->errors++;
  2360 
  2361 	if (contradiction) {
  2362 		/* Do this now, after adding tp, so that it ends up
  2363 		 * after both the INSTALL and the REMOVE in the array.
  2364 		 */
  2365 		add_transaction_package(trans, new_package, old_package,
  2366 					RAZOR_PACKAGE_CONTRADICTION,
  2367 					NULL, NULL);
  2368 	}
  2369 
  2370 	if (req_package)
  2371 		tp->dep_package = req_package;
  2372 	if (!req_prop)
  2373 		return;
  2374 
  2375 	pool = req_set->string_pool.data;
  2376 	pkgs = req_set->packages.data;
  2377 	if (!req_package) {
  2378 		for (pkg = list_first(&req_prop->packages, &req_set->package_pool); pkg; pkg = list_next(pkg)) {
  2379 			if (bitarray_get(reqpkgbits, pkg->data))
  2380 				break;
  2381 		}
  2382 		if (pkg)
  2383 			tp->dep_package = &pool[pkgs[pkg->data].name];
  2384 	}
  2385 
  2386 	tp->dep_type = req_prop->type;
  2387 	tp->dep_property = &pool[req_prop->name];
  2388 	tp->dep_relation = req_prop->relation;
  2389 	tp->dep_version = &pool[req_prop->version];
  2390 }
  2391 
  2392 /* FIXME: make this more efficient */
  2393 static struct razor_package *
  2394 find_old_version(struct razor_transaction_resolver *trans,
  2395 		 struct razor_package *pkg)
  2396 {
  2397 	struct razor_package *spkgs, *sp, *send;
  2398 	const char *spool, *upool;
  2399 
  2400 	if (!package_in_set(pkg, trans->upstream))
  2401 		return NULL;
  2402 
  2403 	sp = spkgs = trans->system->packages.data;
  2404 	send = trans->system->packages.data + trans->system->packages.size;
  2405 	spool = trans->system->string_pool.data;
  2406 	upool = trans->upstream->string_pool.data;
  2407 
  2408 	while (sp < send &&
  2409 	       strcmp(&spool[sp->name], &upool[pkg->name]) < 0)
  2410 		sp++;
  2411 	if (sp < send && strcmp(&spool[sp->name], &upool[pkg->name]) == 0)
  2412 		return sp;
  2413 	return NULL;
  2414 }
  2415 
  2416 static void
  2417 razor_transaction_satisfy_installs(struct razor_transaction_resolver *trans)
  2418 {
  2419 	struct razor_package *spkgs, *upkgs, *pkg, *upgrade;
  2420 	struct razor_property *sp, *sprops, *sprop_end;
  2421 	struct razor_property *up, *uprops, *uprop_end;
  2422 	const char *spool, *upool;
  2423 
  2424 	spkgs = trans->system->packages.data;
  2425 	sprops = trans->system->properties.data;
  2426 	sprop_end = trans->system->properties.data + trans->system->properties.size;
  2427 	spool = trans->system->string_pool.data;
  2428 	upkgs = trans->upstream->packages.data;
  2429 	uprops = trans->upstream->properties.data;
  2430 	uprop_end = trans->upstream->properties.data + trans->upstream->properties.size;
  2431 	upool = trans->upstream->string_pool.data;
  2432 
  2433 	sp = sprops;
  2434 	up = uprops;
  2435 	while (up < uprop_end) {
  2436 		/* Skip 'up' ahead to a property of a package which is
  2437 		 * to-be-installed.
  2438 		 */
  2439 		while (up < uprop_end &&
  2440 		       !prop_is_being_installed(trans, up))
  2441 			up++;
  2442 		if (up == uprop_end)
  2443 			break;
  2444 		sp = skip_to_matching_property(trans, up, sp);
  2445 
  2446 		switch (up->type) {
  2447 		case RAZOR_PROPERTY_REQUIRES:
  2448 			if (!strncmp(&upool[up->name], "rpmlib(", 7))
  2449 				break;
  2450 
  2451 			if (find_installed_package_for_property(trans, sp, up, up) ||
  2452 			    find_installed_package_for_file(trans, &upool[up->name])) {
  2453 				/* Requires something that is either installed
  2454 				 * or to-be-installed.
  2455 				 */
  2456 				break;
  2457 			}
  2458 
  2459 			/* See if we can install a new upstream provider */
  2460 			pkg = find_uninstalled_package_for_property(trans, sp, up, up);
  2461 			if (!pkg)
  2462 				pkg = find_uninstalled_package_for_file(trans, &upool[up->name]);
  2463 			add_transaction_package(trans, pkg, find_old_version(trans, pkg),
  2464 						RAZOR_PACKAGE_INSTALL,
  2465 						NULL, up);
  2466 			break;
  2467 
  2468 		case RAZOR_PROPERTY_PROVIDES:
  2469 			/* find_installed_package_for_property works backwards
  2470 			 * here, finding a *conflicting* installed package.
  2471 			 */
  2472 			pkg = find_installed_package_for_property(trans, sp, up, up);
  2473 			if (!pkg)
  2474 				break;
  2475 
  2476 			if (package_in_set(pkg, trans->system)) {
  2477 				/* pkg CONFLICTS with what 'up' PROVIDES. Try
  2478 				 * finding an upgrade
  2479 				 */
  2480 				upgrade = find_upgrade_for_installed_conflict(trans, pkg, up);
  2481 				if (upgrade) {
  2482 					add_transaction_package(trans, upgrade, pkg,
  2483 								RAZOR_PACKAGE_INSTALL,
  2484 								&spool[pkg->name], sp);
  2485 				}
  2486 				break;
  2487 			}
  2488 
  2489 			add_transaction_package(trans, NULL, pkg,
  2490 						RAZOR_PACKAGE_OLD_CONFLICT,
  2491 						NULL, up);
  2492 			break;
  2493 
  2494 		case RAZOR_PROPERTY_CONFLICTS:
  2495 			pkg = find_installed_package_for_property(trans, sp, up, up);
  2496 			if (!pkg)
  2497 				break;
  2498 
  2499 			if (package_in_set(pkg, trans->system)) {
  2500 				/* Conflicts with something already installed.
  2501 				 * Try to upgrade out.
  2502 				 */
  2503 				upgrade = find_upgrade_for_installed_conflict(trans, pkg, up);
  2504 				if (upgrade) {
  2505 					add_transaction_package(trans, upgrade, pkg,
  2506 								RAZOR_PACKAGE_INSTALL,
  2507 								NULL, up);
  2508 					break;
  2509 				}
  2510 			}
  2511 
  2512 			add_transaction_package(trans, pkg, NULL,
  2513 						RAZOR_PACKAGE_NEW_CONFLICT,
  2514 						NULL, up);
  2515 			break;
  2516 
  2517 		case RAZOR_PROPERTY_OBSOLETES:
  2518 			pkg = find_installed_package_for_property(trans, sp, up, up);
  2519 			if (pkg) {
  2520 				/* If pkg is to-be-installed, this
  2521 				 * will add a CONTRADICTION error as well.
  2522 				 */
  2523 				add_transaction_package(trans, NULL, pkg,
  2524 							RAZOR_PACKAGE_OBSOLETED,
  2525 							NULL, up);
  2526 			}
  2527 			break;
  2528 
  2529 		default:
  2530 			/* can't happen */
  2531 			break;
  2532 		}
  2533 		up++;
  2534 	}
  2535 }
  2536 
  2537 #if 0
  2538 /* Look through pkg's PROVIDES, and for each one that no other package
  2539  * provides, add its property index to lost_provides.
  2540  */
  2541 static void
  2542 gather_lost_provides(struct razor_set *set, struct razor_package *pkg,
  2543 		     struct array *lost_provides)
  2544 {
  2545 	struct razor_property *props = set->properties.data, *prop;
  2546 	struct list *p, *providers;
  2547 	uint32_t *lost;
  2548 
  2549 	for (p = list_first(&pkg->properties, &set->property_pool); p; p = list_next(p)) {
  2550 		prop = &props[p->data];
  2551 		if (prop->type != RAZOR_PROPERTY_PROVIDES)
  2552 			continue;
  2553 
  2554 		providers = list_first(&prop->packages, &set->package_pool);
  2555 		if (providers && !list_next(providers)) {
  2556 			lost = array_add(lost_provides, sizeof *lost);
  2557 			*lost = p->data;
  2558 		}
  2559 	}
  2560 }
  2561 
  2562 static void
  2563 gather_lost_files(struct razor_set *set, struct razor_package *pkg,
  2564 		  struct array *lost_files)
  2565 {
  2566 	struct razor_entry *entries = set->files.data, *entry, **lost;
  2567 	struct list *e, *providers;
  2568 
  2569 	for (e = list_first(&pkg->files, &set->file_pool); e; e = list_next(e)) {
  2570 		entry = &entries[e->data];
  2571 		providers = list_first(&entry->packages, &set->package_pool);
  2572 		if (providers && !list_next(providers)) {
  2573 			lost = array_add(lost_files, sizeof *lost);
  2574 			*lost = entry;
  2575 		}
  2576 	}
  2577 }
  2578 
  2579 static void
  2580 lose_required_package(struct razor_transaction_resolver *trans,
  2581 		      struct razor_property *req,
  2582 		      struct list_head *lost_package_list)
  2583 {
  2584 	struct razor_package *pkgs, *lost_package;
  2585 	char *pool = trans->system->string_pool.data;
  2586 	struct list *p;
  2587 
  2588 	pkgs = trans->system->packages.data;
  2589 	lost_package = &pkgs[list_first(lost_package_list, &trans->system->package_pool)->data];
  2590 
  2591 	for (p = list_first(&req->packages, &trans->system->package_pool); p; p = list_next(p)) {
  2592 		add_transaction_package(trans, NULL, &pkgs[p->data],
  2593 					RAZOR_PACKAGE_REMOVE,
  2594 					&pool[lost_package->name], req);
  2595 	}
  2596 }
  2597 
  2598 static void
  2599 lose_requirement(struct razor_transaction_resolver *trans,
  2600 		 struct razor_property *req,
  2601 		 struct razor_property *lost_provider,
  2602 		 struct razor_property *first_provider)
  2603 {
  2604 	struct razor_property *provider, *prop_end;
  2605 	char *pool = trans->system->string_pool.data;
  2606 
  2607 	prop_end = trans->system->properties.data + trans->system->properties.size;
  2608 
  2609 	/* See if any other provider satisfies req */
  2610 	for (provider = first_provider;
  2611 	     provider < prop_end && provider->type == RAZOR_PROPERTY_PROVIDES && provider->name == lost_provider->name;
  2612 	     provider++) {
  2613 		if (provider == lost_provider)
  2614 			continue;
  2615 
  2616 		if (provider_satisfies_requirement(provider, pool, req, pool))
  2617 			return;
  2618 	}
  2619 
  2620 	lose_required_package(trans, req, &lost_provider->packages);
  2621 }
  2622 
  2623 static void
  2624 razor_transaction_satisfy_removes(struct razor_transaction_resolver *trans,
  2625 				  int start, int end)
  2626 {
  2627 	struct razor_transaction_package *packages;
  2628 	struct razor_package *pkgs;
  2629 	int pkg_count, r;
  2630 	uint32_t *lost, *lost_end;
  2631 	struct razor_entry *entry, **lostf, **lostf_end;
  2632 	struct razor_property *props, *prop_end, *req, *first_provider;
  2633 	struct array lost_provides, lost_files;
  2634 	char *pool;
  2635 
  2636 	pkgs = trans->system->packages.data;
  2637 	pkg_count = trans->system->packages.size / sizeof (struct razor_package);
  2638 	props = trans->system->properties.data;
  2639 	prop_end = trans->system->properties.data + trans->system->properties.size;
  2640 	pool = trans->system->string_pool.data;
  2641 	packages = trans->packages.data;
  2642 
  2643 	array_init(&lost_files);
  2644 	array_init(&lost_provides);
  2645 	for (r = start; r < end; r++) {
  2646 		if (!packages[r].old_package ||
  2647 		    (packages[r].state != RAZOR_PACKAGE_REMOVE &&
  2648 		     packages[r].state != RAZOR_PACKAGE_INSTALL &&
  2649 		     packages[r].state != RAZOR_PACKAGE_FORCED_UPDATE &&
  2650 		     packages[r].state != RAZOR_PACKAGE_OBSOLETED)
  2651 			continue;
  2652 
  2653 		gather_lost_provides(trans->system, packages[r].old_package,
  2654 				     &lost_provides);
  2655 		gather_lost_files(trans->system, packages[r].old_package,
  2656 				  &lost_files);
  2657 	}
  2658 
  2659 	/* Handle lost_provides */
  2660 	lost_end = lost_provides.data + lost_provides.size;
  2661 	for (lost = lost_provides.data; lost < lost_end; lost++) {
  2662 		/* Requires FOO will appear before Provides FOO */
  2663 		for (req = &props[*lost]; req > props && req->name == props[*lost].name && req->type != RAZOR_PROPERTY_REQUIRES; req--)
  2664 			;
  2665 		first_provider = req + 1;
  2666 
  2667 		while (req > props && req->name == props[*lost].name) {
  2668 			lose_requirement(trans, req, &props[*lost],
  2669 					 first_provider);
  2670 			req--;
  2671 		}
  2672 	}
  2673 	array_release(&lost_provides);
  2674 
  2675 	/* And now lost_files. FIXME, inefficient */
  2676 	lostf_end = lost_files.data + lost_files.size;
  2677 
  2678 	req = props;
  2679 	/* Due to the sorting of props, this loop is likely a no-op */
  2680 	while (req < prop_end && pool[req->name] != '/')
  2681 		req++;
  2682 
  2683 	for (; req < prop_end && pool[req->name] == '/'; req++) {
  2684 		if (req->type != RAZOR_PROPERTY_REQUIRES)
  2685 			continue;
  2686 
  2687 		entry = find_entry(trans->system, trans->system->files.data,
  2688 				   &pool[req->name]);
  2689 		if (!entry)
  2690 			continue;
  2691 
  2692 		for (lostf = lost_files.data; lostf < lostf_end; lostf++) {
  2693 			if (*lostf == entry)
  2694 				break;
  2695 		}
  2696 		if (lostf == lostf_end)
  2697 			continue;
  2698 
  2699 		lose_required_package(trans, req, &entry->packages);
  2700 	}
  2701 	array_release(&lost_files);
  2702 }
  2703 #endif
  2704 
  2705 static struct razor_package *
  2706 find_upgrade_for_lost_requirement(struct razor_transaction_resolver *trans,
  2707 				  struct razor_package *pkg,
  2708 				  struct razor_property *req)
  2709 {
  2710 	struct razor_package *upkgs, *up, *uend;
  2711 	struct razor_property *uprops;
  2712 	const char *spool, *upool;
  2713 	struct list *prop;
  2714 
  2715 	up = upkgs = trans->upstream->packages.data;
  2716 	uend = trans->upstream->packages.data + trans->upstream->packages.size;
  2717 	upool = trans->upstream->string_pool.data;
  2718 	uprops = trans->upstream->properties.data;
  2719 	spool = trans->system->string_pool.data;
  2720 
  2721 	while (up < uend &&
  2722 	       strcmp(&upool[up->name], &spool[pkg->name]) < 0)
  2723 		up++;
  2724 	if (up == uend || strcmp(&upool[up->name], &spool[pkg->name]) != 0)
  2725 		return NULL;
  2726 
  2727 	for (prop = list_first(&up->properties, &trans->system->property_pool); prop; prop = list_next(prop)) {
  2728 		if (uprops[prop->data].type == RAZOR_PROPERTY_REQUIRES &&
  2729 		    strcmp(&upool[uprops[prop->data].name], &spool[req->name]) == 0 &&
  2730 		    uprops[prop->data].relation == req->relation &&
  2731 		    strcmp(&upool[uprops[prop->data].version], &spool[req->version]) == 0)
  2732 			return NULL;
  2733 	}
  2734 	return up;
  2735 }
  2736 
  2737 static int
  2738 prop_is_being_removed(struct razor_transaction_resolver *trans,
  2739 		      struct razor_property *prop)
  2740 {
  2741 	struct list *pkg;
  2742 
  2743 	for (pkg = list_first(&prop->packages, &trans->system->package_pool); pkg; pkg = list_next(pkg)) {
  2744 		if (bitarray_get(&trans->syspkgs, pkg->data))
  2745 			return 0;
  2746 	}
  2747 	return 1;
  2748 }
  2749 
  2750 static int
  2751 prop_is_being_updated(struct razor_transaction_resolver *trans,
  2752 		      struct razor_property *prop)
  2753 {
  2754 	struct razor_package *packages = trans->system->packages.data;
  2755 	const char *pool = trans->system->string_pool.data;
  2756 	struct razor_transaction_package *tp;
  2757 	struct list *pkg;
  2758 
  2759 	/* Assumes prop_is_being_removed returns true */
  2760 
  2761 	for (pkg = list_first(&prop->packages, &trans->system->package_pool); pkg; pkg = list_next(pkg)) {
  2762 		tp = find_transaction_package(trans, &pool[packages[pkg->data].name]);
  2763 		if (tp && tp->state == RAZOR_PACKAGE_REMOVE)
  2764 			return 0;
  2765 	}
  2766 	return 1;
  2767 }
  2768 
  2769 static void
  2770 razor_transaction_satisfy_removes(struct razor_transaction_resolver *trans)
  2771 {
  2772 	struct razor_package *spkgs, *upkgs, *pkg, *upgrade;
  2773 	struct razor_property *sp, *sprops, *sprop_end, *sr;
  2774 	struct razor_property *up, *uprops, *uprop_end, *ur, *first_up;
  2775 	const char *spool, *upool, *removed_package;
  2776 	struct list *reqpkg;
  2777 
  2778 	spkgs = trans->system->packages.data;
  2779 	sprops = trans->system->properties.data;
  2780 	sprop_end = trans->system->properties.data + trans->system->properties.size;
  2781 	spool = trans->system->string_pool.data;
  2782 	upkgs = trans->upstream->packages.data;
  2783 	uprops = trans->upstream->properties.data;
  2784 	uprop_end = trans->upstream->properties.data + trans->upstream->properties.size;
  2785 	upool = trans->upstream->string_pool.data;
  2786 
  2787 	up = uprops;
  2788 	for (sp = sprops; sp < sprop_end; sp++) {
  2789 		/* Skip 'sp' ahead to a PROVIDES of a package which is
  2790 		 * to-be-removed.
  2791 		 */
  2792 		while (sp < sprop_end &&
  2793 		       (sp->type != RAZOR_PROPERTY_PROVIDES ||
  2794 			!prop_is_being_removed(trans, sp)))
  2795 			sp++;
  2796 		if (sp == sprop_end)
  2797 			break;
  2798 
  2799 		removed_package = &spool[spkgs[list_first(&sp->packages, &trans->system->package_pool)->data].name];
  2800 
  2801 		/* Skip 'up' to match */
  2802 		up = skip_to_matching_property(trans, sp, up);
  2803 		ur = first_up = up;
  2804 
  2805 		/* If the package is just being upgraded, we may
  2806 		 * already be installing an identical PROVIDES, so
  2807 		 * check for that.
  2808 		 */
  2809 		while (up < uprop_end &&
  2810 		       strcmp(&spool[sp->name], &upool[up->name]) == 0 &&
  2811 		       (up->type != RAZOR_PROPERTY_PROVIDES || 
  2812 			sp->relation != up->relation ||
  2813 			strcmp(&spool[sp->name], &upool[up->name]) != 0))
  2814 			up++;
  2815 		if (up < uprop_end &&
  2816 		    up->type == RAZOR_PROPERTY_PROVIDES &&
  2817 		    strcmp(&spool[sp->name], &upool[up->name]) == 0 &&
  2818 		    sp->relation == up->relation &&
  2819 		    strcmp(&spool[sp->version], &upool[up->version]) == 0 &&
  2820 		    prop_is_being_installed(trans, up)) {
  2821 			up = first_up;
  2822 			continue;
  2823 		}
  2824 		up = first_up;
  2825 
  2826 		/* For all still-installed packages that require
  2827 		 * sp->name, see if they are satisfied by any other
  2828 		 * still-installed or to-be-installed property. If
  2829 		 * not, either remove or attempt to update the
  2830 		 * package, depending on why the required property has
  2831 		 * disappeared
  2832 		 */
  2833 		sr = sp;
  2834 		while (sr > sprops + 1 && (sr - 1)->name == sr->name)
  2835 			sr--;
  2836 		for (; sr->type == RAZOR_PROPERTY_REQUIRES; sr++) {
  2837 			if (prop_is_being_removed(trans, sr))
  2838 				continue;
  2839 			if (find_installed_package_for_property(trans, sp, up, sr))
  2840 				continue;
  2841 
  2842 			for (reqpkg = list_first(&sr->packages, &trans->system->package_pool); reqpkg; reqpkg = list_next(reqpkg)) {
  2843 				if (!bitarray_get(&trans->syspkgs, reqpkg->data))
  2844 					continue;
  2845 				pkg = &spkgs[reqpkg->data];
  2846 				if (prop_is_being_updated(trans, sp)) {
  2847 					upgrade = find_upgrade_for_lost_requirement(trans, pkg, sr);
  2848 					if (upgrade) {
  2849 						add_transaction_package(trans, upgrade, pkg,
  2850 									RAZOR_PACKAGE_FORCED_UPDATE,
  2851 									removed_package, NULL);
  2852 					} else {
  2853 						/* This will cause a CONTRADICTION */
  2854 						add_transaction_package(trans, pkg, NULL,
  2855 									RAZOR_PACKAGE_INSTALL,
  2856 									removed_package, sr);
  2857 					}
  2858 				} else {
  2859 					add_transaction_package(trans, NULL, pkg,
  2860 								RAZOR_PACKAGE_REMOVE,
  2861 								removed_package, sr);
  2862 				}
  2863 			}
  2864 		}
  2865 	}
  2866 }
  2867 
  2868 struct razor_transaction *
  2869 razor_transaction_create(struct razor_set *system, struct razor_set *upstream,
  2870 			 int update_count, const char **update_packages,
  2871 			 int remove_count, const char **remove_packages)
  2872 {
  2873 	struct razor_transaction_resolver trans;
  2874 	struct razor_transaction *ret_trans;
  2875 	int start, end;
  2876 
  2877 	trans.system = system;
  2878 	trans.upstream = upstream ? upstream : razor_set_create();
  2879 	array_init(&trans.packages);
  2880 	bitarray_init(&trans.syspkgs, trans.system->packages.size / sizeof (struct razor_package), 1);
  2881 	bitarray_init(&trans.uppkgs, trans.upstream->packages.size / sizeof (struct razor_package), 0);
  2882 	trans.errors = 0;
  2883 
  2884 	if (update_count > 0 || remove_count > 0) {
  2885 		find_packages(&trans,
  2886 			      update_count, update_packages,
  2887 			      remove_count, remove_packages);
  2888 	} else
  2889 		find_all_packages(&trans);
  2890 
  2891 	start = 0;
  2892 	end = trans.packages.size / sizeof (struct razor_transaction_package);
  2893 
  2894 	while (!trans.errors && start != end) {
  2895 		razor_transaction_satisfy_installs(&trans);
  2896 		razor_transaction_satisfy_removes(&trans);
  2897 
  2898 		start = end;
  2899 		end = trans.packages.size / sizeof (struct razor_transaction_package);
  2900 	}
  2901 
  2902 	ret_trans = zalloc(sizeof *ret_trans);
  2903 	ret_trans->system = trans.system;
  2904 	ret_trans->upstream = trans.upstream;
  2905 	ret_trans->packages = trans.packages.data;
  2906 	ret_trans->package_count = end;
  2907 	ret_trans->errors = trans.errors;
  2908 	return ret_trans;
  2909 }
  2910 
  2911 const char * const razor_version_relations[] = {
  2912 	/* same order as enum razor_version_relation */
  2913 	"<", "<=", "=", ">=", ">"
  2914 };
  2915 
  2916 const char * const razor_property_types[] = {
  2917 	/* same order as enum razor_property_type */
  2918 	"requires", "provides", "conflicts with", "obsoletes"
  2919 };
  2920 
  2921 void
  2922 razor_transaction_describe(struct razor_transaction *trans)
  2923 {
  2924 	struct razor_transaction_package *p, *pend, *tps;
  2925 	int errors_only = 0;
  2926 
  2927 	tps = trans->packages;
  2928 	pend = trans->packages + trans->package_count;
  2929 	for (p = trans->packages; p < pend; p++) {
  2930 		switch (p->state) {
  2931 		case RAZOR_PACKAGE_INSTALL:
  2932 			if (errors_only)
  2933 				break;
  2934 
  2935 			printf("Installing %s %s", p->name, p->new_version);
  2936 			if (p->dep_package) {
  2937 				if (p->dep_type == RAZOR_PROPERTY_CONFLICTS &&
  2938 				    !strcmp(p->dep_package, p->name)) {
  2939 					printf(" because %s %s conflicts with %s",
  2940 					       p->name, p->old_version, p->dep_property);
  2941 					if (*p->dep_version) {
  2942 						printf(" %s %s",
  2943 						       razor_version_relations[p->dep_relation],
  2944 						       p->dep_version);
  2945 					}
  2946 				} else {
  2947 					printf(" for %s", p->dep_package);
  2948 					if (*p->dep_version) {
  2949 						printf(", which %s %s %s %s",
  2950 						       razor_property_types[p->dep_type],
  2951 						       p->dep_property,
  2952 						       razor_version_relations[p->dep_relation],
  2953 						       p->dep_version);
  2954 					} else if (strcmp(p->dep_property, p->name) != 0) {
  2955 						printf(", which %s %s",
  2956 						       razor_property_types[p->dep_type],
  2957 						       p->dep_property);
  2958 					}
  2959 				}
  2960 			}
  2961 			printf("\n");
  2962 			break;
  2963 
  2964 		case RAZOR_PACKAGE_FORCED_UPDATE:
  2965 			if (errors_only)
  2966 				break;
  2967 
  2968 			printf("Updating %s to %s due to update of %s\n",
  2969 			       p->name, p->new_version, p->dep_package);
  2970 			break;
  2971 
  2972 		case RAZOR_PACKAGE_REMOVE:
  2973 			if (errors_only)
  2974 				break;
  2975 			printf("Removing %s %s", p->name, p->old_version);
  2976 			if (p->dep_package) {
  2977 				printf(" which required %s",
  2978 				       p->dep_package);
  2979 				if (strcmp(p->dep_property, p->name) != 0)
  2980 					printf(" for %s", p->dep_property);
  2981 			}
  2982 			printf("\n");
  2983 			break;
  2984 
  2985 		case RAZOR_PACKAGE_OBSOLETED:
  2986 			if (errors_only)
  2987 				break;
  2988 			printf("Removing %s %s", p->name, p->old_version);
  2989 			if (p->dep_package) {
  2990 				printf(" which is obsoleted by %s",
  2991 				       p->dep_package);
  2992 			}
  2993 			printf("\n");
  2994 			break;
  2995 
  2996 		case RAZOR_PACKAGE_INSTALL_UNAVAILABLE:
  2997 			printf("Error: can't install %s: not found\n", p->name);
  2998 			errors_only = 1;
  2999 			break;
  3000 
  3001 		case RAZOR_PACKAGE_REMOVE_NOT_INSTALLED:
  3002 			printf("Error: can't remove %s: not installed\n", p->name);
  3003 			errors_only = 1;
  3004 			break;
  3005 
  3006 		case RAZOR_PACKAGE_UP_TO_DATE:
  3007 			printf("Error: can't upgrade %s: %s is most recent version\n", p->name, p->old_version);
  3008 			errors_only = 1;
  3009 			break;
  3010 
  3011 		case RAZOR_PACKAGE_CONTRADICTION:
  3012 			printf("Error: package %s is marked for both installation and removal\n", p->name);
  3013 			errors_only = 1;
  3014 			break;
  3015 
  3016 		case RAZOR_PACKAGE_OLD_CONFLICT:
  3017 			printf("Error: can't install %s, because installed package %s conflicts with ",
  3018 			       p->name, p->dep_package);
  3019 			if (*p->dep_version) {
  3020 				printf("%s %s %s",
  3021 				       p->dep_property,
  3022 				       razor_version_relations[p->dep_relation],
  3023 				       p->dep_version);
  3024 			} else
  3025 				printf("it");
  3026 			printf("\n");
  3027 
  3028 			errors_only = 1;
  3029 			break;
  3030 
  3031 		case RAZOR_PACKAGE_NEW_CONFLICT:
  3032 			printf("Error: can't install %s, because it conflicts with %s",
  3033 			       p->name, p->dep_package);
  3034 			if (*p->dep_version) {
  3035 				printf(" %s %s",
  3036 				       razor_version_relations[p->dep_relation],
  3037 				       p->dep_version);
  3038 			}
  3039 			printf("\n");
  3040 
  3041 			errors_only = 1;
  3042 			break;
  3043 
  3044 		case RAZOR_PACKAGE_UNSATISFIABLE:
  3045 			printf("Error: can't find package for %s", p->dep_property);
  3046 			if (*p->dep_version) {
  3047 				printf(" %s %s",
  3048 					razor_version_relations[p->dep_relation],
  3049 					p->dep_version);
  3050 			}
  3051 			printf(" which is required by %s\n",
  3052 				p->dep_package);
  3053 			errors_only = 1;
  3054 			break;
  3055 
  3056 		default:
  3057 			/* Shouldn't actually happen */
  3058 			break;
  3059 		}
  3060 	}
  3061 }
  3062 
  3063 struct razor_set *
  3064 razor_transaction_run(struct razor_transaction *trans)
  3065 {
  3066 	struct array install_packages, remove_packages;
  3067 	struct razor_merger *merger;
  3068 	struct razor_package *pkg, *i, *iend, *r, *rend, *s, *send;
  3069 	struct source *source1, *source2;
  3070 	char *spool, *ipool, *rpool;
  3071 	uint32_t *map;
  3072 	int p, cmp;
  3073 
  3074 	/* FIXME */
  3075 	if (trans->errors)
  3076 		return NULL;
  3077 
  3078 	/* Sort the transaction packages into two arrays */
  3079 	array_init(&install_packages);
  3080 	array_init(&remove_packages);
  3081 	for (p = 0; p < trans->package_count; p++) {
  3082 		if (trans->packages[p].state == RAZOR_PACKAGE_INSTALL) {
  3083 			pkg = array_add(&install_packages, sizeof *pkg);
  3084 			*pkg = *trans->packages[p].new_package;
  3085 		} else {
  3086 			pkg = array_add(&remove_packages, sizeof *pkg);
  3087 			*pkg = *trans->packages[p].old_package;
  3088 		}
  3089 	}
  3090 	map = qsort_with_data(install_packages.data,
  3091 			      install_packages.size / sizeof *pkg,
  3092 			      sizeof *pkg,
  3093 			      compare_packages,
  3094 			      trans->upstream);
  3095 	free(map);
  3096 	map = qsort_with_data(remove_packages.data,
  3097 			      remove_packages.size / sizeof *pkg,
  3098 			      sizeof *pkg,
  3099 			      compare_packages,
  3100 			      trans->system);
  3101 	free(map);
  3102 
  3103 	merger = razor_merger_create(trans->system, trans->upstream);
  3104 
  3105 	source1 = &merger->source1;
  3106 	source2 = &merger->source2;
  3107 
  3108 	i = install_packages.data;
  3109 	iend = install_packages.data + install_packages.size;
  3110 	ipool = trans->upstream->string_pool.data;
  3111 
  3112 	r = remove_packages.data;
  3113 	rend = remove_packages.data + remove_packages.size;
  3114 	rpool = trans->system->string_pool.data;
  3115 
  3116 	s = trans->system->packages.data;
  3117 	send = trans->system->packages.data + trans->system->packages.size;
  3118 	spool = trans->system->string_pool.data;
  3119 
  3120 	while (s < send || i < iend) {
  3121 		/* Check if s is being removed */
  3122 		if (s < send && r < rend &&
  3123 		    s->name == r->name && s->version && r->version) {
  3124 			s++;
  3125 			r++;
  3126 			continue;
  3127 		}
  3128 
  3129 		if (s < send && i < iend)
  3130 			cmp = strcmp(&spool[s->name], &ipool[i->name]);
  3131 		else if (s < send)
  3132 			cmp = -1;
  3133 		else
  3134 			cmp = 1;
  3135 		if (cmp < 0) {
  3136 			add_package(merger, s, source1, 0);
  3137 			s++;
  3138 		} else if (cmp == 0) {
  3139 			add_package(merger, i, source2, UPSTREAM_SOURCE);
  3140 			s++;
  3141 			i++;
  3142 		} else {
  3143 			add_package(merger, i, source2, UPSTREAM_SOURCE);
  3144 			i++;
  3145 		}
  3146 	}
  3147 
  3148 	array_release(&install_packages);
  3149 	array_release(&remove_packages);
  3150 
  3151 	return razor_merger_finish(merger);
  3152 }
  3153 
  3154 void
  3155 razor_transaction_destroy(struct razor_transaction *trans)
  3156 {
  3157 	int p;
  3158 
  3159 	for (p = 0; p < trans->package_count; p++) {
  3160 		if (!trans->packages[p].dep_package &&
  3161 		    (trans->packages[p].state == RAZOR_PACKAGE_INSTALL_UNAVAILABLE ||
  3162 		     trans->packages[p].state == RAZOR_PACKAGE_REMOVE_NOT_INSTALLED))
  3163 			free((char *)trans->packages[p].name);
  3164 	}
  3165 	free(trans);
  3166 
  3167 	/* FIXME: free upstream if it was created as an empty set */
  3168 }