@@ -13,7 +13,7 @@ INSTALL_DATA=${INSTALL} -m 644

 LIBS=-lpthread

 OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o src/tty_interface.o

-TESTOBJECTS=test/fzytest.c src/match.o src/choices.o

+TESTOBJECTS=test/fzytest.c src/match.o src/choices.o src/options.o

 all: fzy

@@ -5,6 +5,7 @@

 #include <unistd.h>

 #include <errno.h>

+#include "options.h"

 #include "choices.h"

 #include "match.h"

@@ -96,7 +97,7 @@ static void choices_reset_search(choices_t *c) {

 	c->results = NULL;

 }

-void choices_init(choices_t *c) {

+void choices_init(choices_t *c, options_t *options) {

 	c->strings = NULL;

 	c->results = NULL;

@@ -4,6 +4,7 @@

 #include <stdio.h>

 #include "match.h"

+#include "options.h"

 struct scored_result {

 	score_t score;

@@ -26,7 +27,7 @@ typedef struct {

 	unsigned int worker_count;

 } choices_t;

-void choices_init(choices_t *c);

+void choices_init(choices_t *c, options_t *options);

 void choices_fread(choices_t *c, FILE *file);

 void choices_destroy(choices_t *c);

 void choices_add(choices_t *c, const char *choice);

@@ -19,7 +19,7 @@ int main(int argc, char *argv[]) {

 	options_parse(&options, argc, argv);

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &options);

 	choices_fread(&choices, stdin);

 	if (options.benchmark) {

@@ -30,10 +30,11 @@ static struct option longopts[] = {{"show-matches", required_argument, NULL, 'e'

 				   {"show-scores", no_argument, NULL, 's'},

 				   {"version", no_argument, NULL, 'v'},

 				   {"benchmark", optional_argument, NULL, 'b'},

+				   {"workers", required_argument, NULL, 'j'},

 				   {"help", no_argument, NULL, 'h'},

 				   {NULL, 0, NULL, 0}};

-void options_set_defaults(options_t *options) {

+void options_init(options_t *options) {

 	/* set defaults */

 	options->benchmark = 0;

 	options->filter = NULL;

@@ -46,7 +47,7 @@ void options_set_defaults(options_t *options) {

 }

 void options_parse(options_t *options, int argc, char *argv[]) {

-	options_set_defaults(options);

+	options_init(options);

 	int c;

 	while ((c = getopt_long(argc, argv, "vhse:q:l:t:p:", longopts, NULL)) != -1) {

@@ -12,6 +12,7 @@ typedef struct {

 	const char *prompt;

 } options_t;

+void options_init(options_t *options);

 void options_parse(options_t *options, int argc, char *argv[]);

 #endif

@@ -7,6 +7,7 @@

 #include "../config.h"

 #include "match.h"

 #include "choices.h"

+#include "options.h"

 int testsrun = 0, testsfailed = 0, assertionsrun = 0;

@@ -21,6 +22,8 @@ int testsrun = 0, testsfailed = 0, assertionsrun = 0;

 #define assert_streq(a, b) assert(!strcmp(a, b))

+static options_t default_options;

+

 void runtest(void (*test)()) {

 	testsrun++;

 	test();

@@ -160,7 +163,7 @@ void test_positions_exact() {

 void test_choices_empty() {

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &default_options);

 	assert(choices.size == 0);

 	assert(choices.available == 0);

 	assert(choices.selection == 0);

@@ -176,7 +179,7 @@ void test_choices_empty() {

 void test_choices_1() {

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &default_options);

 	choices_add(&choices, "tags");

 	choices_search(&choices, "");

@@ -201,7 +204,7 @@ void test_choices_1() {

 void test_choices_2() {

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &default_options);

 	choices_add(&choices, "tags");

 	choices_add(&choices, "test");

@@ -253,7 +256,7 @@ void test_choices_without_search() {

 	/* Before a search is run, it should return no results */

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &default_options);

 	assert(choices.available == 0);

 	assert(choices.selection == 0);

@@ -273,7 +276,7 @@ void test_choices_without_search() {

 /* Regression test for segfault */

 void test_choices_unicode() {

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &default_options);

 	choices_add(&choices, "Edmund Husserl - Méditations cartésiennes - Introduction a la phénoménologie.pdf");

 	choices_search(&choices, "e");

@@ -283,7 +286,7 @@ void test_choices_unicode() {

 void test_choices_large_input() {

 	choices_t choices;

-	choices_init(&choices);

+	choices_init(&choices, &default_options);

 	int N = 100000;

 	char *strings[N];

@@ -323,6 +326,8 @@ int main(int argc, char *argv[]) {

 	 * If we have no debugger running, we should ignore it */

 	signal(SIGTRAP, ignore_signal);

+	options_init(&default_options);

+

 	runtest(test_match);

 	runtest(test_relative_scores);

 	runtest(test_exact_scores);