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