deleted file mode 100644

@@ -1,290 +0,0 @@

-#include <stdio.h>

-#include <string.h>

-#include <stdlib.h>

-#include <ctype.h>

-#include <getopt.h>

-#include <limits.h>

-

-#include "match.h"

-#include "tty.h"

-#include "choices.h"

-

-#include "config.h"

-

-static int flag_show_scores = 0;

-

-static size_t num_lines = 10;

-static size_t scrolloff = 1;

-

-static const char *prompt = "> ";

-

-#define SEARCH_SIZE_MAX 4096

-static char search[SEARCH_SIZE_MAX + 1] = {0};

-

-static void clear(tty_t *tty) {

-	tty_setcol(tty, 0);

-	size_t line = 0;

-	while (line++ < num_lines) {

-		tty_newline(tty);

-	}

-	tty_clearline(tty);

-	tty_moveup(tty, line - 1);

-	tty_flush(tty);

-}

-

-static void draw_match(tty_t *tty, const char *choice, int selected) {

-	int n = strlen(search);

-	size_t positions[n + 1];

-	for (int i = 0; i < n + 1; i++)

-		positions[i] = -1;

-

-	double score = match_positions(search, choice, &positions[0]);

-

-	size_t maxwidth = tty_getwidth(tty);

-

-	if (flag_show_scores)

-		tty_printf(tty, "(%5.2f) ", score);

-

-	if (selected)

-		tty_setinvert(tty);

-

-	for (size_t i = 0, p = 0; choice[i] != '\0'; i++) {

-		if (i + 1 < maxwidth) {

-			if (positions[p] == i) {

-				tty_setfg(tty, TTY_COLOR_HIGHLIGHT);

-				p++;

-			} else {

-				tty_setfg(tty, TTY_COLOR_NORMAL);

-			}

-			tty_printf(tty, "%c", choice[i]);

-		} else {

-			tty_printf(tty, "$");

-			break;

-		}

-	}

-	tty_setnormal(tty);

-}

-

-static void draw(tty_t *tty, choices_t *choices) {

-	size_t start = 0;

-	size_t current_selection = choices->selection;

-	if (current_selection + scrolloff >= num_lines) {

-		start = current_selection + scrolloff - num_lines + 1;

-		if (start + num_lines >= choices_available(choices)) {

-			start = choices_available(choices) - num_lines;

-		}

-	}

-	tty_setcol(tty, 0);

-	tty_printf(tty, "%s%s", prompt, search);

-	tty_clearline(tty);

-	for (size_t i = start; i < start + num_lines; i++) {

-		tty_printf(tty, "\n");

-		tty_clearline(tty);

-		const char *choice = choices_get(choices, i);

-		if (choice) {

-			draw_match(tty, choice, i == choices->selection);

-		}

-	}

-	tty_moveup(tty, num_lines);

-	tty_setcol(tty, strlen(prompt) + strlen(search));

-	tty_flush(tty);

-}

-

-static void emit(choices_t *choices) {

-	const char *selection = choices_get(choices, choices->selection);

-	if (selection) {

-		/* output the selected result */

-		printf("%s\n", selection);

-	} else {

-		/* No match, output the query instead */

-		printf("%s\n", search);

-	}

-}

-

-#define KEY_CTRL(key) ((key) - ('@'))

-#define KEY_DEL 127

-#define KEY_ESC 27

-

-static void run(tty_t *tty, choices_t *choices) {

-	choices_search(choices, search);

-	char ch;

-	do {

-		draw(tty, choices);

-		ch = tty_getchar(tty);

-		size_t search_size = strlen(search);

-		if (isprint(ch)) {

-			if (search_size < SEARCH_SIZE_MAX) {

-				search[search_size++] = ch;

-				search[search_size] = '\0';

-				choices_search(choices, search);

-			}

-		} else if (ch == KEY_DEL || ch == KEY_CTRL('H')) { /* DEL || Backspace (C-H) */

-			if (search_size)

-				search[--search_size] = '\0';

-			choices_search(choices, search);

-		} else if (ch == KEY_CTRL('U')) { /* C-U */

-			search_size = 0;

-			search[0] = '\0';

-			choices_search(choices, search);

-		} else if (ch == KEY_CTRL('W')) { /* C-W */

-			if (search_size)

-				search[--search_size] = '\0';

-			while (search_size && !isspace(search[--search_size]))

-				search[search_size] = '\0';

-			choices_search(choices, search);

-		} else if (ch == KEY_CTRL('N')) { /* C-N */

-			choices_next(choices);

-		} else if (ch == KEY_CTRL('P')) { /* C-P */

-			choices_prev(choices);

-		} else if (ch == KEY_CTRL('I')) { /* TAB (C-I) */

-			strncpy(search, choices_get(choices, choices->selection), SEARCH_SIZE_MAX);

-			choices_search(choices, search);

-		} else if (ch == KEY_CTRL('C') || ch == KEY_CTRL('D')) { /* ^C || ^D */

-			clear(tty);

-			tty_close(tty);

-			exit(EXIT_FAILURE);

-		} else if (ch == KEY_CTRL('M')) { /* CR */

-			clear(tty);

-

-			/* ttyout should be flushed before outputting on stdout */

-			tty_close(tty);

-

-			emit(choices);

-

-			/* Return to eventually exit successfully */

-			return;

-		} else if (ch == KEY_ESC) { /* ESC */

-			ch = tty_getchar(tty);

-			if (ch == '[' || ch == 'O') {

-				ch = tty_getchar(tty);

-				if (ch == 'A') { /* UP ARROW */

-					choices_prev(choices);

-				} else if (ch == 'B') { /* DOWN ARROW */

-					choices_next(choices);

-				}

-			}

-		}

-	} while (1);

-}

-

-static const char *usage_str =

-    ""

-    "Usage: fzy [OPTION]...\n"

-    " -l, --lines=LINES        Specify how many lines of results to show (default 10)\n"

-    " -p, --prompt=PROMPT      Input prompt (default '> ')\n"

-    " -q, --query=QUERY        Use QUERY as the initial search string\n"

-    " -e, --show-matches=QUERY Output the sorted matches of QUERY\n"

-    " -t, --tty=TTY            Specify file to use as TTY device (default /dev/tty)\n"

-    " -s, --show-scores        Show the scores of each match\n"

-    " -h, --help     Display this help and exit\n"

-    " -v, --version  Output version information and exit\n";

-

-static void usage(const char *argv0) {

-	fprintf(stderr, usage_str, argv0);

-}

-

-static struct option longopts[] = {{"show-matches", required_argument, NULL, 'e'},

-				   {"query", required_argument, NULL, 'q'},

-				   {"lines", required_argument, NULL, 'l'},

-				   {"tty", required_argument, NULL, 't'},

-				   {"prompt", required_argument, NULL, 'p'},

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

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

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

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

-				   {NULL, 0, NULL, 0}};

-

-int main(int argc, char *argv[]) {

-	int benchmark = 0;

-	const char *filter = NULL;

-	const char *tty_filename = "/dev/tty";

-	char c;

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

-		switch (c) {

-			case 'v':

-				printf("%s " VERSION " (c) 2014 John Hawthorn\n", argv[0]);

-				exit(EXIT_SUCCESS);

-			case 's':

-				flag_show_scores = 1;

-				break;

-			case 'q':

-				strncpy(search, optarg, SEARCH_SIZE_MAX);

-				break;

-			case 'e':

-				filter = optarg;

-				break;

-			case 'b':

-				if (optarg) {

-					if (sscanf(optarg, "%d", &benchmark) != 1) {

-						usage(argv[0]);

-						exit(EXIT_FAILURE);

-					}

-				} else {

-					benchmark = 100;

-				}

-				break;

-			case 't':

-				tty_filename = optarg;

-				break;

-			case 'p':

-				prompt = optarg;

-				break;

-			case 'l': {

-				int l;

-				if (!strcmp(optarg, "max")) {

-					l = INT_MAX;

-				} else if (sscanf(optarg, "%d", &l) != 1 || l < 3) {

-					fprintf(stderr, "Invalid format for --lines: %s\n", optarg);

-					fprintf(stderr, "Must be integer in range 3..\n");

-					usage(argv[0]);

-					exit(EXIT_FAILURE);

-				}

-				num_lines = l;

-			} break;

-			case 'h':

-			default:

-				usage(argv[0]);

-				exit(EXIT_SUCCESS);

-		}

-	}

-	if (optind != argc) {

-		usage(argv[0]);

-		exit(EXIT_FAILURE);

-	}

-

-	choices_t choices;

-	choices_init(&choices);

-	choices_fread(&choices, stdin);

-

-	if (benchmark) {

-		if (!filter) {

-			fprintf(stderr, "Must specify -e/--show-matches with --benchmark\n");

-			exit(EXIT_FAILURE);

-		}

-		for (int i = 0; i < benchmark; i++)

-			choices_search(&choices, filter);

-	} else if (filter) {

-		choices_search(&choices, filter);

-		for (size_t i = 0; i < choices_available(&choices); i++) {

-			if (flag_show_scores)

-				printf("%f\t", choices_getscore(&choices, i));

-			printf("%s\n", choices_get(&choices, i));

-		}

-	} else {

-		/* interactive */

-		tty_t tty;

-		tty_init(&tty, tty_filename);

-

-		if (num_lines > choices.size)

-			num_lines = choices.size;

-

-		if (num_lines + 1 > tty_getheight(&tty))

-			num_lines = tty_getheight(&tty) - 1;

-

-		run(&tty, &choices);

-	}

-

-	choices_destroy(&choices);

-

-	return 0;

-}

@@ -256,9 +256,6 @@ int main(int argc, char *argv[]) {

 	choices_init(&choices);

 	choices_fread(&choices, stdin);

-	if (num_lines > choices.size)

-		num_lines = choices.size;

-

 	if (benchmark) {

 		if (!filter) {

 			fprintf(stderr, "Must specify -e/--show-matches with --benchmark\n");

@@ -278,6 +275,9 @@ int main(int argc, char *argv[]) {

 		tty_t tty;

 		tty_init(&tty, tty_filename);

+		if (num_lines > choices.size)

+			num_lines = choices.size;

+

 		if (num_lines + 1 > tty_getheight(&tty))

 			num_lines = tty_getheight(&tty) - 1;

@@ -19,7 +19,6 @@ static size_t scrolloff = 1;

 static const char *prompt = "> ";

 #define SEARCH_SIZE_MAX 4096

-static size_t search_size;

 static char search[SEARCH_SIZE_MAX + 1] = {0};

 static void clear(tty_t *tty) {

@@ -112,6 +111,7 @@ static void run(tty_t *tty, choices_t *choices) {

 	do {

 		draw(tty, choices);

 		ch = tty_getchar(tty);

+		size_t search_size = strlen(search);

 		if (isprint(ch)) {

 			if (search_size < SEARCH_SIZE_MAX) {

 				search[search_size++] = ch;

@@ -138,7 +138,6 @@ static void run(tty_t *tty, choices_t *choices) {

 			choices_prev(choices);

 		} else if (ch == KEY_CTRL('I')) { /* TAB (C-I) */

 			strncpy(search, choices_get(choices, choices->selection), SEARCH_SIZE_MAX);

-			search_size = strlen(search);

 			choices_search(choices, search);

 		} else if (ch == KEY_CTRL('C') || ch == KEY_CTRL('D')) { /* ^C || ^D */

 			clear(tty);

@@ -173,6 +172,7 @@ static const char *usage_str =

     "Usage: fzy [OPTION]...\n"

     " -l, --lines=LINES        Specify how many lines of results to show (default 10)\n"

     " -p, --prompt=PROMPT      Input prompt (default '> ')\n"

+    " -q, --query=QUERY        Use QUERY as the initial search string\n"

     " -e, --show-matches=QUERY Output the sorted matches of QUERY\n"

     " -t, --tty=TTY            Specify file to use as TTY device (default /dev/tty)\n"

     " -s, --show-scores        Show the scores of each match\n"

@@ -184,6 +184,7 @@ static void usage(const char *argv0) {

 }

 static struct option longopts[] = {{"show-matches", required_argument, NULL, 'e'},

+				   {"query", required_argument, NULL, 'q'},

 				   {"lines", required_argument, NULL, 'l'},

 				   {"tty", required_argument, NULL, 't'},

 				   {"prompt", required_argument, NULL, 'p'},

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

 	const char *filter = NULL;

 	const char *tty_filename = "/dev/tty";

 	char c;

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

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

 		switch (c) {

 			case 'v':

 				printf("%s " VERSION " (c) 2014 John Hawthorn\n", argv[0]);

@@ -206,6 +207,9 @@ int main(int argc, char *argv[]) {

 			case 's':

 				flag_show_scores = 1;

 				break;

+			case 'q':

+				strncpy(search, optarg, SEARCH_SIZE_MAX);

+				break;

 			case 'e':

 				filter = optarg;

 				break;

@@ -195,7 +195,7 @@ static struct option longopts[] = {{"show-matches", required_argument, NULL, 'e'

 int main(int argc, char *argv[]) {

 	int benchmark = 0;

-	const char *initial_query = NULL;

+	const char *filter = NULL;

 	const char *tty_filename = "/dev/tty";

 	char c;

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

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

 				flag_show_scores = 1;

 				break;

 			case 'e':

-				initial_query = optarg;

+				filter = optarg;

 				break;

 			case 'b':

 				if (optarg) {

@@ -256,14 +256,14 @@ int main(int argc, char *argv[]) {

 		num_lines = choices.size;

 	if (benchmark) {

-		if (!initial_query) {

+		if (!filter) {

 			fprintf(stderr, "Must specify -e/--show-matches with --benchmark\n");

 			exit(EXIT_FAILURE);

 		}

 		for (int i = 0; i < benchmark; i++)

-			choices_search(&choices, initial_query);

-	} else if (initial_query) {

-		choices_search(&choices, initial_query);

+			choices_search(&choices, filter);

+	} else if (filter) {

+		choices_search(&choices, filter);

 		for (size_t i = 0; i < choices_available(&choices); i++) {

 			if (flag_show_scores)

 				printf("%f\t", choices_getscore(&choices, i));

@@ -28,6 +28,7 @@ static void clear(tty_t *tty) {

 	while (line++ < num_lines) {

 		tty_newline(tty);

 	}

+	tty_clearline(tty);

 	tty_moveup(tty, line - 1);

 	tty_flush(tty);

 }

@@ -99,8 +99,6 @@ static void emit(choices_t *choices) {

 		/* No match, output the query instead */

 		printf("%s\n", search);

 	}

-

-	exit(EXIT_SUCCESS);

 }

 #define KEY_CTRL(key) ((key) - ('@'))

@@ -152,6 +150,9 @@ static void run(tty_t *tty, choices_t *choices) {

 			tty_close(tty);

 			emit(choices);

+

+			/* Return to eventually exit successfully */

+			return;

 		} else if (ch == KEY_ESC) { /* ESC */

 			ch = tty_getchar(tty);

 			if (ch == '[' || ch == 'O') {

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

 		run(&tty, &choices);

 	}

+	choices_destroy(&choices);

+

 	return 0;

 }

@@ -18,37 +18,6 @@ static size_t scrolloff = 1;

 static const char *prompt = "> ";

-static void read_choices(choices_t *c) {

-	size_t bufsize = 65536;

-	size_t pos = 0;

-	size_t sizeread;

-

-	/* Read entire file into contiguous memory buffer */

-	char *buf = malloc(bufsize);

-	while ((sizeread = fread(buf + pos, 1, bufsize - pos, stdin))) {

-		pos += sizeread;

-		bufsize *= 2;

-		buf = realloc(buf, bufsize);

-	}

-	buf = realloc(buf, pos + 1);

-

-	buf[pos] = 0;

-

-	/* Tokenize input and add to choices */

-	char *line = buf;

-	do {

-		char *nl = strchr(line, '\n');

-		if (nl)

-			*nl++ = '\0';

-

-		/* Skip empty lines */

-		if (*line)

-			choices_add(c, line);

-

-		line = nl;

-	} while (line);

-}

-

 #define SEARCH_SIZE_MAX 4096

 static size_t search_size;

 static char search[SEARCH_SIZE_MAX + 1] = {0};

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

 	choices_t choices;

 	choices_init(&choices);

-	read_choices(&choices);

+	choices_fread(&choices, stdin);

 	if (num_lines > choices.size)

 		num_lines = choices.size;

@@ -19,19 +19,34 @@ static size_t scrolloff = 1;

 static const char *prompt = "> ";

 static void read_choices(choices_t *c) {

-	const char *line;

-	char buf[4096];

-	while (fgets(buf, sizeof buf, stdin)) {

-		char *nl;

-		if ((nl = strchr(buf, '\n')))

-			*nl = '\0';

-

-		if (!(line = strdup(buf))) {

-			fprintf(stderr, "Cannot allocate memory");

-			abort();

-		}

-		choices_add(c, line);

+	size_t bufsize = 65536;

+	size_t pos = 0;

+	size_t sizeread;

+

+	/* Read entire file into contiguous memory buffer */

+	char *buf = malloc(bufsize);

+	while ((sizeread = fread(buf + pos, 1, bufsize - pos, stdin))) {

+		pos += sizeread;

+		bufsize *= 2;

+		buf = realloc(buf, bufsize);

 	}

+	buf = realloc(buf, pos + 1);

+

+	buf[pos] = 0;

+

+	/* Tokenize input and add to choices */

+	char *line = buf;

+	do {

+		char *nl = strchr(line, '\n');

+		if (nl)

+			*nl++ = '\0';

+

+		/* Skip empty lines */

+		if (*line)

+			choices_add(c, line);

+

+		line = nl;

+	} while (line);

 }

 #define SEARCH_SIZE_MAX 4096

@@ -119,6 +119,10 @@ static void emit(choices_t *choices) {

 	exit(EXIT_SUCCESS);

 }

+#define KEY_CTRL(key) ((key) - ('@'))

+#define KEY_DEL 127

+#define KEY_ESC 27

+

 static void run(tty_t *tty, choices_t *choices) {

 	choices_search(choices, search);

 	char ch;

@@ -131,40 +135,40 @@ static void run(tty_t *tty, choices_t *choices) {

 				search[search_size] = '\0';

 				choices_search(choices, search);

 			}

-		} else if (ch == 127 || ch == 8) { /* DEL || backspace */

+		} else if (ch == KEY_DEL || ch == KEY_CTRL('H')) { /* DEL || Backspace (C-H) */

 			if (search_size)

 				search[--search_size] = '\0';

 			choices_search(choices, search);

-		} else if (ch == 21) { /* C-U */

+		} else if (ch == KEY_CTRL('U')) { /* C-U */

 			search_size = 0;

 			search[0] = '\0';

 			choices_search(choices, search);

-		} else if (ch == 23) { /* C-W */

+		} else if (ch == KEY_CTRL('W')) { /* C-W */

 			if (search_size)

 				search[--search_size] = '\0';

 			while (search_size && !isspace(search[--search_size]))

 				search[search_size] = '\0';

 			choices_search(choices, search);

-		} else if (ch == 14) { /* C-N */

+		} else if (ch == KEY_CTRL('N')) { /* C-N */

 			choices_next(choices);

-		} else if (ch == 16) { /* C-P */

+		} else if (ch == KEY_CTRL('P')) { /* C-P */

 			choices_prev(choices);

-		} else if (ch == 9) { /* TAB */

+		} else if (ch == KEY_CTRL('I')) { /* TAB (C-I) */

 			strncpy(search, choices_get(choices, choices->selection), SEARCH_SIZE_MAX);

 			search_size = strlen(search);

 			choices_search(choices, search);

-		} else if (ch == 3 || ch == 4) { /* ^C || ^D */

+		} else if (ch == KEY_CTRL('C') || ch == KEY_CTRL('D')) { /* ^C || ^D */

 			clear(tty);

 			tty_close(tty);

 			exit(EXIT_FAILURE);

-		} else if (ch == 13) { /* CR */

+		} else if (ch == KEY_CTRL('M')) { /* CR */

 			clear(tty);

 			/* ttyout should be flushed before outputting on stdout */

 			tty_close(tty);

 			emit(choices);

-		} else if (ch == 27) { /* ESC */

+		} else if (ch == KEY_ESC) { /* ESC */

 			ch = tty_getchar(tty);

 			if (ch == '[' || ch == 'O') {

 				ch = tty_getchar(tty);

@@ -157,7 +157,7 @@ static void run(tty_t *tty, choices_t *choices) {

 			clear(tty);

 			tty_close(tty);

 			exit(EXIT_FAILURE);

-		} else if (ch == 10) { /* Enter */

+		} else if (ch == 13) { /* CR */

 			clear(tty);

 			/* ttyout should be flushed before outputting on stdout */

@@ -221,12 +221,12 @@ int main(int argc, char *argv[]) {

 				break;

 			case 'b':

 				if (optarg) {

-				    if (sscanf(optarg, "%d", &benchmark) != 1) {

-					usage(argv[0]);

-					exit(EXIT_FAILURE);

-				    }

+					if (sscanf(optarg, "%d", &benchmark) != 1) {

+						usage(argv[0]);

+						exit(EXIT_FAILURE);

+					}

 				} else {

-				    benchmark = 100;

+					benchmark = 100;

 				}

 				break;

 			case 't':

@@ -199,7 +199,7 @@ static struct option longopts[] = {{"show-matches", required_argument, NULL, 'e'

 				   {"prompt", required_argument, NULL, 'p'},

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

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

-				   {"benchmark", no_argument, NULL, 'b'},

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

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

 				   {NULL, 0, NULL, 0}};

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

 				initial_query = optarg;

 				break;

 			case 'b':

-				benchmark = 1;

+				if (optarg) {

+				    if (sscanf(optarg, "%d", &benchmark) != 1) {

+					usage(argv[0]);

+					exit(EXIT_FAILURE);

+				    }

+				} else {

+				    benchmark = 100;

+				}

 				break;

 			case 't':

 				tty_filename = optarg;

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

 			fprintf(stderr, "Must specify -e/--show-matches with --benchmark\n");

 			exit(EXIT_FAILURE);

 		}

-		for (int i = 0; i < 100; i++)

+		for (int i = 0; i < benchmark; i++)

 			choices_search(&choices, initial_query);

 	} else if (initial_query) {

 		choices_search(&choices, initial_query);

@@ -11,14 +11,14 @@

 #include "config.h"

-int flag_show_scores = 0;

+static int flag_show_scores = 0;

-size_t num_lines = 10;

-size_t scrolloff = 1;

+static size_t num_lines = 10;

+static size_t scrolloff = 1;

-const char *prompt = "> ";

+static const char *prompt = "> ";

-void read_choices(choices_t *c) {

+static void read_choices(choices_t *c) {

 	const char *line;

 	char buf[4096];

 	while (fgets(buf, sizeof buf, stdin)) {

@@ -35,10 +35,10 @@ void read_choices(choices_t *c) {

 }

 #define SEARCH_SIZE_MAX 4096

-size_t search_size;

-char search[SEARCH_SIZE_MAX + 1] = {0};

+static size_t search_size;

+static char search[SEARCH_SIZE_MAX + 1] = {0};

-void clear(tty_t *tty) {

+static void clear(tty_t *tty) {

 	tty_setcol(tty, 0);

 	size_t line = 0;

 	while (line++ < num_lines) {

@@ -48,7 +48,7 @@ void clear(tty_t *tty) {

 	tty_flush(tty);

 }

-void draw_match(tty_t *tty, const char *choice, int selected) {

+static void draw_match(tty_t *tty, const char *choice, int selected) {

 	int n = strlen(search);

 	size_t positions[n + 1];

 	for (int i = 0; i < n + 1; i++)

@@ -81,7 +81,7 @@ void draw_match(tty_t *tty, const char *choice, int selected) {

 	tty_setnormal(tty);

 }

-void draw(tty_t *tty, choices_t *choices) {

+static void draw(tty_t *tty, choices_t *choices) {

 	size_t start = 0;

 	size_t current_selection = choices->selection;

 	if (current_selection + scrolloff >= num_lines) {

@@ -106,7 +106,7 @@ void draw(tty_t *tty, choices_t *choices) {

 	tty_flush(tty);

 }

-void emit(choices_t *choices) {

+static void emit(choices_t *choices) {

 	const char *selection = choices_get(choices, choices->selection);

 	if (selection) {

 		/* output the selected result */

@@ -119,7 +119,7 @@ void emit(choices_t *choices) {

 	exit(EXIT_SUCCESS);

 }

-void run(tty_t *tty, choices_t *choices) {

+static void run(tty_t *tty, choices_t *choices) {

 	choices_search(choices, search);

 	char ch;

 	do {

@@ -189,7 +189,7 @@ static const char *usage_str =

     " -h, --help     Display this help and exit\n"

     " -v, --version  Output version information and exit\n";

-void usage(const char *argv0) {

+static void usage(const char *argv0) {

 	fprintf(stderr, usage_str, argv0);

 }

@@ -35,7 +35,7 @@ void read_choices(choices_t *c) {

 }

 #define SEARCH_SIZE_MAX 4096

-int search_size;

+size_t search_size;

 char search[SEARCH_SIZE_MAX + 1] = {0};

 void clear(tty_t *tty) {

@@ -18,15 +18,15 @@ size_t scrolloff = 1;

 const char *prompt = "> ";

-void read_choices(choices_t *c){

+void read_choices(choices_t *c) {

 	const char *line;

 	char buf[4096];

-	while(fgets(buf, sizeof buf, stdin)){

+	while (fgets(buf, sizeof buf, stdin)) {

 		char *nl;

-		if((nl = strchr(buf, '\n')))

+		if ((nl = strchr(buf, '\n')))

 			*nl = '\0';

-		if(!(line = strdup(buf))){

+		if (!(line = strdup(buf))) {

 			fprintf(stderr, "Cannot allocate memory");

 			abort();

 		}

@@ -38,42 +38,42 @@ void read_choices(choices_t *c){

 int search_size;

 char search[SEARCH_SIZE_MAX + 1] = {0};

-void clear(tty_t *tty){

+void clear(tty_t *tty) {

 	tty_setcol(tty, 0);

 	size_t line = 0;

-	while(line++ < num_lines){

+	while (line++ < num_lines) {

 		tty_newline(tty);

 	}

-	tty_moveup(tty, line-1);

+	tty_moveup(tty, line - 1);

 	tty_flush(tty);

 }

-void draw_match(tty_t *tty, const char *choice, int selected){

+void draw_match(tty_t *tty, const char *choice, int selected) {

 	int n = strlen(search);

 	size_t positions[n + 1];

-	for(int i = 0; i < n + 1; i++)

+	for (int i = 0; i < n + 1; i++)

 		positions[i] = -1;

 	double score = match_positions(search, choice, &positions[0]);

 	size_t maxwidth = tty_getwidth(tty);

-	if(flag_show_scores)

+	if (flag_show_scores)

 		tty_printf(tty, "(%5.2f) ", score);

-	if(selected)

+	if (selected)

 		tty_setinvert(tty);

-	for(size_t i = 0, p = 0; choice[i] != '\0'; i++){

-		if(i+1 < maxwidth){

-			if(positions[p] == i){

+	for (size_t i = 0, p = 0; choice[i] != '\0'; i++) {

+		if (i + 1 < maxwidth) {

+			if (positions[p] == i) {

 				tty_setfg(tty, TTY_COLOR_HIGHLIGHT);

 				p++;

-			}else{

+			} else {

 				tty_setfg(tty, TTY_COLOR_NORMAL);

 			}

 			tty_printf(tty, "%c", choice[i]);

-		}else{

+		} else {

 			tty_printf(tty, "$");

 			break;

 		}

@@ -81,23 +81,23 @@ void draw_match(tty_t *tty, const char *choice, int selected){

 	tty_setnormal(tty);

 }

-void draw(tty_t *tty, choices_t *choices){

+void draw(tty_t *tty, choices_t *choices) {

 	size_t start = 0;

 	size_t current_selection = choices->selection;

-	if(current_selection + scrolloff >= num_lines){

+	if (current_selection + scrolloff >= num_lines) {

 		start = current_selection + scrolloff - num_lines + 1;

-		if(start + num_lines >= choices_available(choices)){

+		if (start + num_lines >= choices_available(choices)) {

 			start = choices_available(choices) - num_lines;

 		}

 	}

 	tty_setcol(tty, 0);

 	tty_printf(tty, "%s%s", prompt, search);

 	tty_clearline(tty);

-	for(size_t i = start; i < start + num_lines; i++){

+	for (size_t i = start; i < start + num_lines; i++) {

 		tty_printf(tty, "\n");

 		tty_clearline(tty);

 		const char *choice = choices_get(choices, i);

-		if(choice){

+		if (choice) {

 			draw_match(tty, choice, i == choices->selection);

 		}

 	}

@@ -106,12 +106,12 @@ void draw(tty_t *tty, choices_t *choices){

 	tty_flush(tty);

 }