From d2101dadc86fe17deadca672fa433e6deb020979 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sun, 14 Dec 2008 11:05:19 +0100
Subject: [PATCH] Created basic internet mail message composition
functionality.
---
src/lib-sieve/rfc2822.c | 79 +++++++++++++++++++++++++++++++++--------
src/lib-sieve/rfc2822.h | 23 ++++++++++--
2 files changed, 86 insertions(+), 16 deletions(-)
diff --git a/src/lib-sieve/rfc2822.c b/src/lib-sieve/rfc2822.c
index 8f30b746e..f82eccf0d 100644
--- a/src/lib-sieve/rfc2822.c
+++ b/src/lib-sieve/rfc2822.c
@@ -6,6 +6,7 @@
#include "rfc2822.h"
+#include <stdio.h>
#include <ctype.h>
/* NOTE: much of the functionality implemented here should eventually appear
@@ -34,21 +35,58 @@ bool rfc2822_header_field_name_verify
return TRUE;
}
-void rfc2822_header_add_folded
-(string_t *out, const char *name, const char *body)
+/*
+ *
+ */
+
+const char *rfc2822_header_field_name_sanitize(const char *name)
{
- const char *sp = body, *bp = body, *wp;
- unsigned int len = str_len(out);
+ char *result = t_strdup_noconst(name);
+ char *p;
- /* Add properly formatted header field name first */
- str_append_c(out, i_toupper(name[0]));
- str_append(out, t_str_lcase(name+1));
+ /* Make the whole name lower case ... */
+ result = str_lcase(result);
+
+ /* ... except for the first letter and those that follow '-' */
+ p = result;
+ *p = i_toupper(*p);
+ while ( *p != '\0' ) {
+ if ( *p == '-' ) {
+ p++;
+
+ if ( *p != '\0' )
+ *p = i_toupper(*p);
+
+ continue;
+ }
+
+ p++;
+ }
- /* Add separating colon */
- str_append(out, ": ");
+ return result;
+}
+
+/*
+ * Message construction
+ */
+
+/* FIXME: This should be collected into a Dovecot API for composing internet
+ * mail messages. These functions now use FILE * output streams, but this should
+ * be changed to proper dovecot streams.
+ */
+
+void rfc2822_header_field_write
+(FILE *f, const char *name, const char *body)
+{
+ const char *sp = body, *bp = body, *wp;
+ unsigned int len = strlen(name);
+ /* Write header field name first */
+ fwrite(name, len, 1, f);
+ fwrite(": ", 2, 1, f);
+
/* Add folded field body */
- len = str_len(out) - len;
+ len += 2;
while ( *bp != '\0' ) {
while ( *bp != '\0' && (wp == NULL || len < 80) ) {
if ( *bp == ' ' || *bp == '\t' )
@@ -59,15 +97,28 @@ void rfc2822_header_add_folded
if ( *bp == '\0' ) break;
- str_append_n(out, sp, wp-sp);
- str_append(out, "\r\n");
+ fwrite(sp, wp-sp, 1, f);
+ fwrite("\r\n", 2, 1, f);
len = bp - wp;
sp = wp;
wp = NULL;
}
- str_append_n(out, sp, bp-sp);
- str_append(out, "\r\n");
+ fwrite(sp, bp-sp, 1, f);
+ fwrite("\r\n", 2, 1, f);
+}
+
+void rfc2822_header_field_printf
+(FILE *f, const char *name, const char *body_fmt, ...)
+{
+ string_t *body = t_str_new(256);
+ va_list args;
+
+ va_start(args, body_fmt);
+ str_vprintfa(body, body_fmt, args);
+ va_end(args);
+
+ rfc2822_header_field_write(f, name, str_c(body));
}
diff --git a/src/lib-sieve/rfc2822.h b/src/lib-sieve/rfc2822.h
index b16e65522..fc85ac2a6 100644
--- a/src/lib-sieve/rfc2822.h
+++ b/src/lib-sieve/rfc2822.h
@@ -6,10 +6,29 @@
#include "lib.h"
+#include <stdio.h>
+
+/*
+ * Verification
+ */
+
bool rfc2822_header_field_name_verify
(const char *field_name, unsigned int len);
-void rfc2822_header_add_folded
- (string_t *out, const char *name, const char *body);
+/*
+ *
+ */
+
+const char *rfc2822_header_field_name_sanitize(const char *name);
+
+/*
+ * Message composition
+ */
+
+void rfc2822_header_field_write
+ (FILE *f, const char *name, const char *body);
+
+void rfc2822_header_field_printf
+ (FILE *f, const char *name, const char *body_fmt, ...) ATTR_FORMAT(3, 4);
#endif /* __RFC2822_H */
--
GitLab