Trim leading whitespace from contextual error, detect EOF

Side-note that the token location tuple maintains the correct column
number to include the whitespace in the source file. Side-side note:
tabs are counted as one column but many editors will count them as
whatever the tabstop/tabwidth is.

1 files changed, 7 insertions, 1 deletions

diff --git a/common.c b/common.c
index 96c9b72..c0e0af4 100644
--- a/common.c
+++ b/common.c
@@ -7,13 +7,19 @@ indicate_file_area(FILE* fd, size_t line, size_t column, size_t span) {
 	char margin[] = "  ";
 	/* FIXME use proper line counting, not this hack */
 	char buf[1024];
+	char *line_start = &buf;
+
 	rewind(fd);
 	for (; line; line--) {
 		fgets(buf, sizeof(buf), fd);
 	}
 
+	while (*line_start == '\t' || *line_start == ' ') {
+		line_start++;
+	}
+
 	fputs(margin, stderr);
-	fputs(buf, stderr);
+	fputs(line_start, stderr);
 
 	/* corner case (still needed?) - buf was just return */
 	if (strlen(buf) == 1 && buf[0] == '\n') {