blaze822: api refactoring

1 files changed, 15 insertions, 6 deletions

diff --git a/blaze822.h b/blaze822.h
index 2705084..d3d7d17 100644
--- a/blaze822.h
+++ b/blaze822.h
@@ -1,20 +1,29 @@
 #include <stdint.h>
+#include <sys/types.h>
 
 struct message;
 
-struct message *blaze822(char *file);
-struct message *blaze822_mem(char *buf, size_t len);
-void blaze822_free(struct message *mesg);
+// blaze822.c
+
+struct message *blaze822(char *file);       // just header
+struct message *blaze822_file(char *file);  // header + body
+struct message *blaze822_mem(char *buf, size_t len);  // header + body
+
 char *blaze822_hdr_(struct message *mesg, const char *hdr, size_t len);
 #define blaze822_hdr(mesg, hdr) blaze822_hdr_(mesg, "\0" hdr ":", 2+strlen((hdr)))
-int blaze822_body(struct message *mesg, char *file);
-void blaze822_mem_body(struct message *mesg, char *buf, size_t len);
 
-int blaze822_loop(int, char **, void (*)(char *));
+void blaze822_free(struct message *mesg);
 
 time_t blaze822_date(char *);
 char *blaze822_addr(char *, char **, char **);
+char *blaze822_body(struct message *mesg);
+size_t blaze822_bodylen(struct message *mesg);
+
+int blaze822_loop(int, char **, void (*)(char *));
 
+// rfc2047.c
 
 int blaze822_decode_rfc2047(char *, char *, size_t, char *);
+int blaze822_decode_qp(char *start, char *stop, char **deco, size_t *decleno);
+int blaze822_decode_b64(char *start, char *stop, char **deco, size_t *decleno);