Write special EOF at the end of file

If the file has been padded with extra 0's (since file is written in total
bytes), there is no way to determine what should be the last value. Implement
special 0xFF for this case.

This also changes char to unsigned to avoid comparison failure.

print_helper.c

@@ -27,9 +27,12 @@ void __printb(void *value, size_t size)
 	printf("\n");
 	printf("\n");
 }
 }
 
 
-void print_char(char c)
+void print_char(unsigned char c)
 {
 {
 	switch (c) {
 	switch (c) {
+	case EOF_CHAR:
+		printf("EOF\n");
+		break;
 	case '\n':
 	case '\n':
 		printf("\\n\n");
 		printf("\\n\n");
 		break;
 		break;

print_helper.h

@@ -19,5 +19,5 @@ void __printb(void *value, size_t size);
 	__printb((typeof(_v) *) &_v, sizeof(_v));	\
 	__printb((typeof(_v) *) &_v, sizeof(_v));	\
 })
 })
 
 
-void print_char(char c);
+void print_char(unsigned char c);
 void print_tree(struct tree *parent);
 void print_tree(struct tree *parent);

tree.c

@@ -43,7 +43,7 @@ struct tree *create_tree(FILE *file)
 		freq[c]++;
 		freq[c]++;
 	}
 	}
 
 
-	struct tree **forest = malloc(charcount * sizeof(struct tree));
+	struct tree **forest = malloc((charcount + 1) * sizeof(struct tree));
 
 
 	/* Create empty forest - whoah */
 	/* Create empty forest - whoah */
 	int ntrees = 0;
 	int ntrees = 0;
@@ -53,6 +53,9 @@ struct tree *create_tree(FILE *file)
 		}
 		}
 	}
 	}
 
 
+	/* Insert our special EOF char. */
+	forest[ntrees++] = insert_simple_tree(EOF_CHAR, 1);
+
 	/* Sort ascending */
 	/* Sort ascending */
 	for (int i = 0; i < ntrees; i++) {
 	for (int i = 0; i < ntrees; i++) {
 		for (int j = i+1; j < ntrees; j++) {
 		for (int j = i+1; j < ntrees; j++) {
@@ -85,7 +88,8 @@ struct tree *create_tree(FILE *file)
  * Encoding/Decodíng
  * Encoding/Decodíng
  */
  */
 
 
-static int write_entry(struct BIT_BUFFER *bitbuf, struct tree *parent, char c)
+static int write_entry(struct BIT_BUFFER *bitbuf, struct tree *parent,
+					   unsigned char c)
 {
 {
 	while (parent != NULL) {
 	while (parent != NULL) {
 		struct tree *left, *right;
 		struct tree *left, *right;
@@ -118,6 +122,9 @@ int encode_tree(struct BIT_BUFFER *bitbuf, struct tree *parent, char *buf,
 		write_entry(bitbuf, parent, buf[i]);
 		write_entry(bitbuf, parent, buf[i]);
 	}
 	}
 
 
+	/* Insert our special EOF char. */
+	write_entry(bitbuf, parent, EOF_CHAR);
+
 	return 0;
 	return 0;
 }
 }
 
 
@@ -128,12 +135,20 @@ static int read_entries(struct BIT_BUFFER *bitbuf, FILE *out,
 	struct tree *leaf = parent;
 	struct tree *leaf = parent;
 	while ((bit = bb_read(bitbuf, 1)) != NULL) {
 	while ((bit = bb_read(bitbuf, 1)) != NULL) {
 		if (*bit == 1) {
 		if (*bit == 1) {
+			if (leaf->right->ch == EOF_CHAR) {
+				free(bit);
+				break;
+			}
 			fwrite(&leaf->right->ch, 1, 1, out);
 			fwrite(&leaf->right->ch, 1, 1, out);
 			leaf->right->freq++;
 			leaf->right->freq++;
 			leaf = parent; /* Reset */
 			leaf = parent; /* Reset */
 		} else {
 		} else {
 			leaf = leaf->left;
 			leaf = leaf->left;
 			if (!leaf->left) {
 			if (!leaf->left) {
+				if (leaf->ch == EOF_CHAR) {
+					free(bit);
+					break;
+				}
 				fwrite(&leaf->ch, 1, 1, out);
 				fwrite(&leaf->ch, 1, 1, out);
 				leaf->freq++;
 				leaf->freq++;
 				leaf = parent; /* Reset */
 				leaf = parent; /* Reset */

tree.h

@@ -3,10 +3,13 @@
 
 
 #include "bit-buffer.h"
 #include "bit-buffer.h"
 
 
+/* Our special EOF character. */
+#define EOF_CHAR 0xff
+
 struct tree {
 struct tree {
 	struct tree *left;
 	struct tree *left;
 	struct tree *right;
 	struct tree *right;
-	char ch;
+	unsigned char ch;
 	int freq;
 	int freq;
 };
 };