Fix manpage install location

The hare compiler on OpenBSD doesn't support them :(

.gitignore

@@ -0,0 +1 @@
+/bulb

Makefile

@@ -0,0 +1,31 @@
+.POSIX:
+.SUFFIXES:
+HARE=hare
+HAREFLAGS=
+
+DESTDIR=
+PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
+MANDIR=$(PREFIX)/man
+
+all: bulb
+
+bulb:
+	$(HARE) build $(HAREFLAGS) -o $@ cmd/$@/
+
+check:
+	$(HARE) test $(HAREFLAGS)
+
+clean:
+	rm -f bulb
+
+install:
+	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+	install -Dm755 bulb $(DESTDIR)$(BINDIR)/bulb
+	install -Dm755 doc/bulb.1 $(DESTDIR)$(MANDIR)/man1
+
+uninstall:
+	rm -f $(DESTDIR)$(BINDIR)/bulb
+	rm -f $(DESTDIR)$(MANDIR)/man1/bulb.1
+
+.PHONY: all check clean install uninstall

cmd/bulb/main.ha

@@ -32,7 +32,8 @@ export fn main() void = {
 	let post      = false;
 	let anonymous = false;
 	
-	for (let opt .. cmd.opts) {
+	for (let index = 0z; index < len(cmd.opts); index += 1) {
+		let opt = cmd.opts[index];
 		switch (opt.0) {
 		case 'b' =>
 			board = opt.1;

doc/bulb.1

@@ -82,7 +82,7 @@ that the receiving user(s) be both logged in and monitoring their terminal for
 any messages to ever get through. The
 .BR bulb (1)
 command was written to support asynchronous, persistent conversations between
-users of the same system. It is also possible to create bulletins, MOTDs, etc.
+users of the same system.
 .\"
 .SH AUTHOR
 

internal/bulb/bulb.ha

@@ -1,3 +1,4 @@
+use ascii;
 use bufio;
 use fs;
 use fmt;
@@ -5,6 +6,7 @@ use io;
 use os;
 use path;
 use strings;
+use types;
 
 // TODO
 // two issues:
@@ -40,8 +42,37 @@ export fn read(output: io::handle, board: str, number: int) (void | error) = {
 	// we add 1 to account for the blank line that will always be at the
 	// bottom
 	seek_to_nth_last_line(file, number + 1)?;
-	// TODO don't copy control characters!
+	
-	io::copy(output, file)?;
+	static let output_wbuf: [os::BUFSZ]u8 = [0...];
+	let output = bufio::init(output, [], output_wbuf);
+	let file   = bufio::newscanner(file, types::SIZE_MAX);
+	defer bufio::finish(&file);
+
+	let saw_escape = false;
+	for (true) {
+		let byte = match (bufio::scan_byte(&file)?) {
+		case let byte: u8 => yield byte;
+		case io::EOF      => break;
+		};
+
+		if (byte == '\x1b') {
+			saw_escape = true;
+		} else {
+			if (byte == '\n') {
+				if (saw_escape) {
+					fmt::fprint(&output, "\n  ")?;
+				} else {
+					fmt::fprint(&output, "\n")?;
+				};
+			} else if (!ascii::iscntrl(byte: rune)) {
+				let fake_buffer: [1]u8 = [byte];
+				io::write(&output, fake_buffer)?;
+			};
+			saw_escape = false;
+		};
+	};
+	
+	bufio::flush(&output)?;
 };
 
 export fn post(input: io::handle, board: str, user_name: (str | void)) (void | error) = {
@@ -56,27 +87,26 @@ export fn post(input: io::handle, board: str, user_name: (str | void)) (void | e
 	};
 
 	static let file_wbuf: [os::BUFSZ]u8 = [0...];
-	let file = bufio::init(file, [], file_wbuf);
+	let file  = bufio::init(file, [], file_wbuf);
-	let scanner = bufio::newscanner(input);
+	let input = bufio::newscanner(input, types::SIZE_MAX);
-	defer bufio::finish(&scanner);
+	defer bufio::finish(&input);
 
 	let saw_break = false;
 	fmt::fprintf(&file, "{}: ", user)?;
 	for (true) {
-		let byte = match (bufio::scan_byte(&scanner)?) {
+		let byte = match (bufio::scan_byte(&input)?) {
 		case let byte: u8 => yield byte;
 		case io::EOF      => break;
 		};
 		
 		if (saw_break) {
-			fmt::fprint(&file, "\n  ")?;
+			fmt::fprint(&file, "\x1b\n")?;
 			saw_break = false;
 		};
 
-		switch (byte) {
+		if (byte == '\n') {
-		case '\n' =>
 			saw_break = true;
-		case =>
+		} else if (!ascii::iscntrl(byte: rune)) {
 			let fake_buffer: [1]u8 = [byte];
 			io::write(&file, fake_buffer)?;
 		};
@@ -87,14 +117,16 @@ export fn post(input: io::handle, board: str, user_name: (str | void)) (void | e
 };
 
 export fn list(output: io::handle) (void | error) = {
-	for (let directory .. bulb_path) list_boards_in(output, directory)?;
+	for (let index = 0z; index < len(bulb_path); index += 1) {
+		list_boards_in(output, bulb_path[index])?;
+	};
 };
 
 export fn look_up_board(board: str) (str | no_such_board | invalid_board) = {
 	validate_board_name(board)?;
 	static let buf = path::buffer { ... };
-	for (let directory .. bulb_path) {
+	for (let index = 0z; index < len(bulb_path); index += 1) {
-		let location = path::set(&buf, directory, board)!;
+		let location = path::set(&buf, bulb_path[index], board)!;
 		match (os::stat(location)) {
 		case fs::filestat => return location;
 		case              => void;
@@ -121,8 +153,8 @@ export fn validate_board_name(board: str) (void | invalid_board) = {
 fn list_boards_in(output: io:: handle, directory: str) (void | error) = {
 	let entries = os::readdir(directory)?;
 	defer fs::dirents_free(entries);
-	for (let entry .. entries) {
+	for (let index = 0z; index < len(entries); index += 1) {
-		fmt::fprintln(output, entry.name)?;
+		fmt::fprintln(output, entries[index].name)?;
 	};
 };