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