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