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