@@ -72,9 +72,10 @@ void choices_fread(choices_t *c, FILE *file) {

 	 */

 	/* Tokenize input and add to choices */

+	const char *line_end = c->buffer + c->buffer_size;

 	char *line = c->buffer + buffer_start;

 	do {

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

+		char *nl = strchr(line, c->input_delimiter);

 		if (nl)

 			*nl++ = '\0';

@@ -83,7 +84,7 @@ void choices_fread(choices_t *c, FILE *file) {

 			choices_add(c, line);

 		line = nl;

-	} while (line);

+	} while (line && line < line_end);

 }

 static void choices_resize(choices_t *c, size_t new_capacity) {

@@ -113,6 +114,12 @@ void choices_init(choices_t *c, options_t *options) {

 		c->worker_count = (int)sysconf(_SC_NPROCESSORS_ONLN);

 	}

+	if (options->read_null) {

+		c->input_delimiter = '\0';

+	} else {

+		c->input_delimiter = '\n';

+	}

+

 	choices_reset_search(c);

 }

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

 	size_t selection;

 	unsigned int worker_count;

+	char input_delimiter;

 } choices_t;

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

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

     " -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"

+    " -0, --read-null          Read input delimited by ASCII NUL characters\n"

     " -j, --workers NUM        Use NUM workers for searching. (default is # of CPUs)\n"

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

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

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

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

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

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

+				   {"read-null", no_argument, NULL, '0'},

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

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

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

@@ -48,13 +50,14 @@ void options_init(options_t *options) {

 	options->num_lines    = DEFAULT_NUM_LINES;

 	options->prompt       = DEFAULT_PROMPT;

 	options->workers      = DEFAULT_WORKERS;

+	options->read_null    = 0;

 }

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

 	options_init(options);

 	int c;

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

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

 		switch (c) {

 			case 'v':

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

@@ -62,6 +65,9 @@ void options_parse(options_t *options, int argc, char *argv[]) {

 			case 's':

 				options->show_scores = 1;

 				break;

+			case '0':

+				options->read_null = 1;

+				break;

 			case 'q':

 				options->init_search = optarg;

 				break;

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

 	unsigned int scrolloff;

 	const char *prompt;

 	unsigned int workers;

+	int read_null;

 } options_t;

 void options_init(options_t *options);

@@ -184,6 +184,10 @@ void tty_printf(tty_t *tty, const char *fmt, ...) {

 	va_end(args);

 }

+void tty_putc(tty_t *tty, char c) {

+	fputc(c, tty->fout);

+}

+

 void tty_flush(tty_t *tty) {

 	fflush(tty->fout);

 }

@@ -51,6 +51,7 @@ void tty_moveup(tty_t *tty, int i);

 void tty_setcol(tty_t *tty, int col);

 void tty_printf(tty_t *tty, const char *fmt, ...);

+void tty_putc(tty_t *tty, char c);

 void tty_flush(tty_t *tty);

 size_t tty_getwidth(tty_t *tty);

@@ -65,7 +65,11 @@ static void draw_match(tty_interface_t *state, const char *choice, int selected)

 		} else {

 			tty_setfg(tty, TTY_COLOR_NORMAL);

 		}

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

+		if (choice[i] == '\n') {

+			tty_putc(tty, ' ');

+		} else {

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

+		}

 	}

 	tty_setwrap(tty);

 	tty_setnormal(tty);

@@ -456,6 +456,7 @@ Usage: fzy [OPTION]...

  -e, --show-matches=QUERY Output the sorted matches of QUERY

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

  -s, --show-scores        Show the scores of each match

+ -0, --read-null          Read input delimited by ASCII NUL characters

  -j, --workers NUM        Use NUM workers for searching. (default is # of CPUs)

  -h, --help     Display this help and exit

  -v, --version  Output version information and exit