Escape LF in board file, refuse to store or print control chars

.gitignore

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

Makefile

@@ -0,0 +1,30 @@
+.POSIX:
+.SUFFIXES:
+HARE=hare
+HAREFLAGS=
+
+DESTDIR=
+PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
+MANDIR=$(PREFIX)/share/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/*.1 $(DESTDIR)$(MANDIR)/man1
+
+uninstall:
+	rm -f $(DESTDIR)$(BINDIR)/bulb
+
+.PHONY: all check clean install uninstall

cmd/bulb/main.ha

@@ -1,8 +1,8 @@
-use bulb;
 use errors;
 use fmt;
 use fs;
 use getopt;
+use internal::bulb;
 use io;
 use os;
 use path;

doc/bulb.1

@@ -35,12 +35,23 @@ Posts a message read from the standard input. See the STANDARD INPUT section.
 .IP \fB-u\fP
 Operates undercover. All posts made will be under the name \(lqanonymous\(rq.
 .\"
+.SH ENVIRONMENT
+
+The BULBPATH environment variable specifies a colon-separated list of
+directories (much like PATH) in which to search for boards. Directories at the
+start take precedence over directories at the end. It has a value of
+.I /var/bulb
+by default.
+.SH FILES
+.I /var/bulb/*
+.\"
 .SH STANDARD INPUT
 
 When the
 .B -p
-option is supplied, the standard input will be read until EOF. It will be posted
-under the name of the current user in whichever board the user selected.
+option is supplied, the standard input will be read until EOF. The resulting
+text will be posted under the name of the current user in whichever board is
+selected.
 .\"
 .SH STANDARD OUTPUT
 
@@ -71,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;
@@ -6,6 +7,17 @@ use os;
 use path;
 use strings;
 
+// TODO
+// two issues:
+// A: posts are stored exactly as they are formatted
+// B: posts need to be sanitized from control chars going in and going out
+// C: specifying a number of posts to read only works with lines because it
+//    cant separate out the individual posts
+//
+// all of these can be fixed by escaping line breaks as the post is written to
+// the board, and then rendering them once they get to the reading stage.
+// sanitize the text at both stages.
+
 let bulb_path: []str = [];
 @init fn bulb_path() void = bulb_path = strings::split(os::tryenv("BULBPATH", "/var/bulb"), ":");
 @fini fn bulb_path() void = free(bulb_path);
@@ -29,7 +41,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)?;
-	io::copy(output, file)?;
+	
+	static let output_wbuf: [os::BUFSZ]u8 = [0...];
+	let output = bufio::init(output, [], output_wbuf);
+	let file   = bufio::newscanner(file);
+	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) = {
@@ -44,27 +86,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 scanner = bufio::newscanner(input);
-	defer bufio::finish(&scanner);
+	let file  = bufio::init(file, [], file_wbuf);
+	let input = bufio::newscanner(input);
+	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) {
-		case '\n' =>
+		if (byte == '\n') {
 			saw_break = true;
-		case =>
+		} else if (!ascii::iscntrl(byte: rune)) {
 			let fake_buffer: [1]u8 = [byte];
 			io::write(&file, fake_buffer)?;
 		};