Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit e939545a e939545a5d54df95c5a05f8efc597ea81604e586 by Sam Roberts
Options

gnu indented

1 parent 78a5a246
Inline Side-by-side
Showing 2 changed files with 374 additions and 238 deletions
......@@ -37,7 +37,7 @@ char from[256];
char subject[256];
int
main(int argc, char **argv)
main (int argc, char **argv)
{
mailbox_t mbox = NULL;
int ret;
......@@ -59,64 +59,73 @@ main(int argc, char **argv)
list_append (bookie, imap_record);
}
if ( ( ret = mailbox_create_default (&mbox, mailbox_name) ) != 0) {
fprintf (stderr, "could not create - %s\n", strerror(ret));
if ((ret = mailbox_create_default (&mbox, mailbox_name)) != 0)
{
fprintf (stderr, "could not create - %s\n", strerror (ret));
exit (2);
}
/* Debuging Trace. */
if ( 0 ) {
if (0)
{
mu_debug_t debug;
mailbox_get_debug (mbox, &debug);
mu_debug_set_level (debug, MU_DEBUG_TRACE|MU_DEBUG_PROT);
mu_debug_set_level (debug, MU_DEBUG_TRACE | MU_DEBUG_PROT);
}
/* Open the mailbox for reading only. */
if ( ( ret = mailbox_open (mbox, MU_STREAM_RDWR) ) != 0) {
fprintf (stderr, "could not open - %s\n", strerror(ret));
if ((ret = mailbox_open (mbox, MU_STREAM_RDWR)) != 0)
{
fprintf (stderr, "could not open - %s\n", strerror (ret));
exit (2);
}
/* Iterator through the entire message set. */
mailbox_messages_count (mbox, &count);
for(i = 1; i <= count; ++i) {
for (i = 1; i <= count; ++i)
{
message_t msg;
header_t hdr;
size_t nparts;
size_t msize;
if (( ret = mailbox_get_message (mbox, i, &msg) ) != 0) {
fprintf (stderr, "mailbox_get_message - %s\n", strerror(ret));
exit(2);
if ((ret = mailbox_get_message (mbox, i, &msg)) != 0)
{
fprintf (stderr, "mailbox_get_message - %s\n", strerror (ret));
exit (2);
}
if (( ret = message_size (msg, &msize) ) != 0) {
fprintf (stderr, "message_size - %s\n", strerror(ret));
exit(2);
if ((ret = message_size (msg, &msize)) != 0)
{
fprintf (stderr, "message_size - %s\n", strerror (ret));
exit (2);
}
if (( ret = message_get_header (msg, &hdr) ) != 0) {
fprintf (stderr, "message_get_header - %s\n", strerror(ret));
exit(2);
if ((ret = message_get_header (msg, &hdr)) != 0)
{
fprintf (stderr, "message_get_header - %s\n", strerror (ret));
exit (2);
}
header_get_value (hdr, MU_HEADER_FROM, from, sizeof (from), NULL);
header_get_value (hdr, MU_HEADER_SUBJECT, subject, sizeof (subject), NULL);
printf("From: %s\tSubject: %s\n", from, subject);
if ( ( ret = message_get_num_parts(msg, &nparts) ) != 0 ) {
fprintf (stderr, "message_get_num_parts - %s\n", strerror(ret));
exit(2);
}
printf("-- Number of parts in message - %d\n",nparts);
printf("-- Total message size - %d\n",msize);
message_display_parts(msg, "\t");
}
mailbox_close(mbox);
mailbox_destroy(&mbox);
header_get_value (hdr, MU_HEADER_SUBJECT, subject, sizeof (subject),
NULL);
printf ("From: %s\tSubject: %s\n", from, subject);
if ((ret = message_get_num_parts (msg, &nparts)) != 0)
{
fprintf (stderr, "message_get_num_parts - %s\n", strerror (ret));
exit (2);
}
printf ("-- Number of parts in message - %d\n", nparts);
printf ("-- Total message size - %d\n", msize);
message_display_parts (msg, "\t");
}
mailbox_close (mbox);
mailbox_destroy (&mbox);
return 0;
}
char buf[2048];
void
message_display_parts(message_t msg, char *indent)
message_display_parts (message_t msg, char *indent)
{
int ret, j;
size_t msize, nparts, nsubparts;
......@@ -130,91 +139,123 @@ message_display_parts(message_t msg, char *indent)
size_t nbytes;
/* How many part those the message has? */
if ( ( ret = message_get_num_parts(msg, &nparts) ) != 0 ) {
fprintf (stderr, "message_get_num_parts - %s\n", strerror(ret));
exit(2);
if ((ret = message_get_num_parts (msg, &nparts)) != 0)
{
fprintf (stderr, "message_get_num_parts - %s\n", strerror (ret));
exit (2);
}
/* Iterate through all the parts.
Treat type "message/rfc822" differently, since it is a message of is own
that can have other subparts(recursive). */
for( j = 1; j <= nparts; j++) {
if (( ret = message_get_part(msg, j, &part ) ) != 0 ) {
fprintf (stderr, "mime_get_part - %s\n", strerror(ret));
exit(2);
}
if (( ret = message_size (part, &msize) ) != 0) {
fprintf (stderr, "message_size - %s\n", strerror(ret));
exit(2);
}
if (( ret = message_get_header (part, &hdr) ) != 0) {
fprintf (stderr, "message_get_header - %s\n", strerror(ret));
exit(2);
}
header_get_value (hdr, MU_HEADER_CONTENT_TYPE, type, sizeof (type), NULL);
printf("%sType of part %d = %s\n", indent, j, type);
printf("%sMessage part size - %d\n",indent, msize);
for (j = 1; j <= nparts; j++)
{
if ((ret = message_get_part (msg, j, &part)) != 0)
{
fprintf (stderr, "mime_get_part - %s\n", strerror (ret));
exit (2);
}
if ((ret = message_size (part, &msize)) != 0)
{
fprintf (stderr, "message_size - %s\n", strerror (ret));
exit (2);
}
if ((ret = message_get_header (part, &hdr)) != 0)
{
fprintf (stderr, "message_get_header - %s\n", strerror (ret));
exit (2);
}
header_get_value (hdr, MU_HEADER_CONTENT_TYPE, type, sizeof (type),
NULL);
printf ("%sType of part %d = %s\n", indent, j, type);
printf ("%sMessage part size - %d\n", indent, msize);
encoding[0] = '\0';
header_get_value (hdr, MU_HEADER_CONTENT_TRANSFER_ENCODING, encoding, sizeof (encoding), NULL);
header_get_value (hdr, MU_HEADER_CONTENT_TRANSFER_ENCODING, encoding,
sizeof (encoding), NULL);
ismulti = 0;
if ( (type[0] && strncasecmp( type, "message/rfc822", strlen(type)) == 0 ) ||
( message_is_multipart (part, &ismulti) == 0 && ismulti ) ) {
if ((type[0]
&& strncasecmp (type, "message/rfc822", strlen (type)) == 0)
|| (message_is_multipart (part, &ismulti) == 0 && ismulti))
{
char tmp[10];
if ( !ismulti ) {
ret = message_unencapsulate(part, &part, NULL);
if (!ismulti)
{
ret = message_unencapsulate (part, &part, NULL);
if (ret != 0)
fprintf (stderr, "message_unencapsulate - %s\n", strerror(ret));
fprintf (stderr, "message_unencapsulate - %s\n",
strerror (ret));
break;
}
if (( ret = message_get_header (part, &hdr) ) != 0) {
fprintf (stderr, "message_get_header - %s\n", strerror(ret));
exit(2);
if ((ret = message_get_header (part, &hdr)) != 0)
{
fprintf (stderr, "message_get_header - %s\n", strerror (ret));
exit (2);
}
header_get_value (hdr, MU_HEADER_FROM, from, sizeof (from), NULL);
header_get_value (hdr, MU_HEADER_SUBJECT, subject, sizeof (subject), NULL);
printf("%sEncapsulated message : %s\t%s\n", indent, from, subject);
printf("%s-------------------------------------------------------------------\n", indent);
if ( ( ret = message_get_num_parts(part, &nsubparts) ) != 0 ) {
fprintf (stderr, "mime_get_num_parts - %s\n", strerror(ret));
exit(2);
}
strcpy(tmp, indent);
strcat(tmp,"\t");
message_display_parts(part, tmp);
header_get_value (hdr, MU_HEADER_SUBJECT, subject, sizeof (subject),
NULL);
printf ("%sEncapsulated message : %s\t%s\n", indent, from, subject);
printf
("%s-------------------------------------------------------------------\n",
indent);
if ((ret = message_get_num_parts (part, &nsubparts)) != 0)
{
fprintf (stderr, "mime_get_num_parts - %s\n", strerror (ret));
exit (2);
}
strcpy (tmp, indent);
strcat (tmp, "\t");
message_display_parts (part, tmp);
message_destroy (&part, NULL);
}
else if ( type[0] == '\0' || (strncasecmp( type, "text/plain", strlen("text/plain")) == 0) || (strncasecmp( type, "text/html", strlen("text/html")) == 0)) {
printf("%sText Message\n",indent);
printf("%s-------------------------------------------------------------------\n", indent);
message_get_body(part, &body);
body_get_stream(body, &str);
filter_create(&str, str, encoding, 0, 0);
else if (type[0] == '\0'
|| (strncasecmp (type, "text/plain", strlen ("text/plain")) ==
0)
|| (strncasecmp (type, "text/html", strlen ("text/html")) ==
0))
{
printf ("%sText Message\n", indent);
printf
("%s-------------------------------------------------------------------\n",
indent);
message_get_body (part, &body);
body_get_stream (body, &str);
filter_create (&str, str, encoding, 0, 0);
offset = 0;
while( stream_readline( str, buf, sizeof(buf), offset, &nbytes ) == 0 && nbytes ) {
printf("%s%s", indent, buf);
while (stream_readline (str, buf, sizeof (buf), offset, &nbytes) ==
0 && nbytes)
{
printf ("%s%s", indent, buf);
offset += nbytes;
}
stream_destroy(&str, NULL);
stream_destroy (&str, NULL);
}
else {
else
{
#if 1
/* Save the attachements. */
char *fname;
message_attachment_filename( part, &fname);
if ( fname == NULL ) {
char buffer[PATH_MAX+1];
fname = tempnam(getcwd(buffer, PATH_MAX), "msg-" );
message_attachment_filename (part, &fname);
if (fname == NULL)
{
char buffer[PATH_MAX + 1];
fname = tempnam (getcwd (buffer, PATH_MAX), "msg-");
}
printf("%sAttachment - saving [%s]\n",indent, fname);
printf("%s-------------------------------------------------------------------\n", indent);
printf ("%sAttachment - saving [%s]\n", indent, fname);
printf
("%s-------------------------------------------------------------------\n",
indent);
/* FIXME: Somethings is not quite correct with this function.
Please fix. */
message_save_attachment(part, fname, NULL);
free(fname);
message_save_attachment (part, fname, NULL);
free (fname);
#endif
}
printf("\n%s End -------------------------------------------------------------------\n", indent);
printf
("\n%s End -------------------------------------------------------------------\n",
indent);
}
}
......
......@@ -48,7 +48,8 @@
/* FIXME: this should be in a public header. */
extern int message_attachment_filename __P ((message_t, const char **filename));
struct _msg_info {
struct _msg_info
{
char *buf;
size_t nbytes;
char *header_buf;
......@@ -64,7 +65,9 @@ struct _msg_info {
#define MSG_HDR "Content-Type: %s; name=%s\nContent-Transfer-Encoding: %s\nContent-Disposition: attachment; filename=%s\n\n"
int message_create_attachment(const char *content_type, const char *encoding, const char *filename, message_t *newmsg)
int
message_create_attachment (const char *content_type, const char *encoding,
const char *filename, message_t * newmsg)
{
header_t hdr;
body_t body;
......@@ -72,88 +75,112 @@ int message_create_attachment(const char *content_type, const char *encoding, co
char *header, *name = NULL, *fname = NULL;
int ret;
if ( filename == NULL || newmsg == NULL )
if (filename == NULL || newmsg == NULL)
return EINVAL;
if ( ( ret = message_create(newmsg, NULL) ) == 0 ) {
if ( content_type == NULL )
if ((ret = message_create (newmsg, NULL)) == 0)
{
if (content_type == NULL)
content_type = "text/plain";
if ( encoding == NULL )
if (encoding == NULL)
encoding = "7bit";
if ( ( fname = strdup(filename) ) != NULL ) {
if ((fname = strdup (filename)) != NULL)
{
name = strrchr (fname, '/');
if (name)
name++;
else
name = fname;
if ( ( header = alloca(strlen(MSG_HDR) + strlen(content_type) + strlen(name) * 2 + strlen(encoding) + 1) ) == NULL )
if ((header =
alloca (strlen (MSG_HDR) + strlen (content_type) +
strlen (name) * 2 + strlen (encoding) + 1)) == NULL)
ret = ENOMEM;
else {
sprintf(header, MSG_HDR, content_type, name, encoding, name);
if ( ( ret = header_create( &hdr, header, strlen(header), *newmsg ) ) == 0 ) {
message_get_body(*newmsg, &body);
if ( ( ret = file_stream_create(&fstream, filename, MU_STREAM_READ) ) == 0 ) {
if ( ( ret = stream_open(fstream) ) == 0 ) {
if ( ( ret = filter_create(&tstream, fstream, encoding, MU_FILTER_ENCODE, MU_STREAM_READ) ) == 0 ) {
body_set_stream(body, tstream, *newmsg);
message_set_header(*newmsg, hdr, NULL);
}
}
}
}
}
}
}
if ( ret ) {
if ( *newmsg )
message_destroy(newmsg, NULL);
if ( hdr )
header_destroy(&hdr, NULL);
if ( fstream )
stream_destroy(&fstream, NULL);
if ( fname )
free(fname);
else
{
sprintf (header, MSG_HDR, content_type, name, encoding, name);
if ((ret =
header_create (&hdr, header, strlen (header),
*newmsg)) == 0)
{
message_get_body (*newmsg, &body);
if ((ret =
file_stream_create (&fstream, filename,
MU_STREAM_READ)) == 0)
{
if ((ret = stream_open (fstream)) == 0)
{
if ((ret =
filter_create (&tstream, fstream, encoding,
MU_FILTER_ENCODE,
MU_STREAM_READ)) == 0)
{
body_set_stream (body, tstream, *newmsg);
message_set_header (*newmsg, hdr, NULL);
}
}
}
}
}
}
}
if (ret)
{
if (*newmsg)
message_destroy (newmsg, NULL);
if (hdr)
header_destroy (&hdr, NULL);
if (fstream)
stream_destroy (&fstream, NULL);
if (fname)
free (fname);
}
return ret;
}
static int _attachment_setup(struct _msg_info **info, message_t msg, stream_t *stream, void **data)
static int
_attachment_setup (struct _msg_info **info, message_t msg, stream_t * stream,
void **data)
{
int sfl, ret;
body_t body;
if ( ( ret = message_get_body(msg, &body) ) != 0 ||
( ret = body_get_stream(body, stream) ) != 0 )
if ((ret = message_get_body (msg, &body)) != 0 ||
(ret = body_get_stream (body, stream)) != 0)
return ret;
stream_get_flags(*stream, &sfl);
if ( data == NULL && (sfl & MU_STREAM_NONBLOCK) )
stream_get_flags (*stream, &sfl);
if (data == NULL && (sfl & MU_STREAM_NONBLOCK))
return EINVAL;
if ( data )
if (data)
*info = *data;
if ( *info == NULL ) {
if ( ( *info = calloc(1, sizeof(struct _msg_info)) ) == NULL )
if (*info == NULL)
{
if ((*info = calloc (1, sizeof (struct _msg_info))) == NULL)
return ENOMEM;
}
if ( ( (*info)->buf = malloc(BUF_SIZE) ) == NULL ) {
free(*info);
if (((*info)->buf = malloc (BUF_SIZE)) == NULL)
{
free (*info);
return ENOMEM;
}
return 0;
}
static void _attachment_free(struct _msg_info *info, int free_message) {
if ( info->buf )
free(info->buf);
if ( info->header_buf )
free(info->header_buf);
if ( free_message ) {
if ( info->msg )
message_destroy(&(info->msg), NULL);
else if ( info->hdr )
header_destroy(&(info->hdr), NULL);
}
free(info);
static void
_attachment_free (struct _msg_info *info, int free_message)
{
if (info->buf)
free (info->buf);
if (info->header_buf)
free (info->header_buf);
if (free_message)
{
if (info->msg)
message_destroy (&(info->msg), NULL);
else if (info->hdr)
header_destroy (&(info->hdr), NULL);
}
free (info);
}
#define _ISSPECIAL(c) ( \
......@@ -162,32 +189,36 @@ static void _attachment_free(struct _msg_info *info, int free_message) {
|| ((c) == '\\') || ((c) == '.') || ((c) == '[') \
|| ((c) == ']') )
static char *_header_get_param(char *field_body, const char *param, size_t *len)
static char *
_header_get_param (char *field_body, const char *param, size_t * len)
{
char *str, *p, *v, *e;
int quoted = 0, was_quoted = 0;
if ( len == NULL || ( str = field_body ) == NULL )
if (len == NULL || (str = field_body) == NULL)
return NULL;
p = strchr(str, ';' );
while ( p ) {
p = strchr (str, ';');
while (p)
{
p++;
while( isspace((unsigned)*p) ) /* walk upto start of param */
while (isspace ((unsigned) *p)) /* walk upto start of param */
p++;
if ( ( v = strchr(p, '=' ) ) == NULL )
if ((v = strchr (p, '=')) == NULL)
break;
*len = 0;
v = e = v + 1;
while ( *e && (quoted || ( !_ISSPECIAL(*e) && !isspace((unsigned)*e) ) ) ) { /* skip pass value and calc len */
if ( *e == '\"' )
while (*e && (quoted || (!_ISSPECIAL (*e) && !isspace ((unsigned) *e))))
{ /* skip pass value and calc len */
if (*e == '\"')
quoted = ~quoted, was_quoted = 1;
else
(*len)++;
e++;
}
if ( strncasecmp(p, param, strlen(param)) ) { /* no match jump to next */
p = strchr(e, ';' );
if (strncasecmp (p, param, strlen (param)))
{ /* no match jump to next */
p = strchr (e, ';');
continue;
}
else
......@@ -196,44 +227,52 @@ static char *_header_get_param(char *field_body, const char *param, size_t *len)
return NULL;
}
int message_attachment_filename(message_t msg, const char **filename)
int
message_attachment_filename (message_t msg, const char **filename)
{
char *pTmp, *fname = NULL;
header_t hdr;
int ret = EINVAL;
size_t size = 0;
if ( filename != NULL && ( ret = message_get_header(msg, &hdr) ) == 0 ) {
if (filename != NULL && (ret = message_get_header (msg, &hdr)) == 0)
{
*filename = NULL;
header_get_value(hdr, "Content-Disposition", NULL, 0, &size);
if ( size ) {
if ( ( pTmp = alloca(size+1) ) == NULL )
header_get_value (hdr, "Content-Disposition", NULL, 0, &size);
if (size)
{
if ((pTmp = alloca (size + 1)) == NULL)
ret = ENOMEM;
header_get_value(hdr, "Content-Disposition", pTmp, size+1, 0);
if ( strstr( pTmp, "attachment" ) != NULL )
fname = _header_get_param(pTmp, "filename", &size);
header_get_value (hdr, "Content-Disposition", pTmp, size + 1, 0);
if (strstr (pTmp, "attachment") != NULL)
fname = _header_get_param (pTmp, "filename", &size);
}
if ( fname == NULL ) {
if (fname == NULL)
{
size = 0;
header_get_value(hdr, "Content-Type", NULL, 0, &size);
if ( size ) {
if ( ( pTmp = alloca(size+1) ) == NULL )
header_get_value (hdr, "Content-Type", NULL, 0, &size);
if (size)
{
if ((pTmp = alloca (size + 1)) == NULL)
ret = ENOMEM;
header_get_value(hdr, "Content-Type", pTmp, size+1, 0);
fname = _header_get_param(pTmp, "name", &size);
header_get_value (hdr, "Content-Type", pTmp, size + 1, 0);
fname = _header_get_param (pTmp, "name", &size);
}
}
if ( fname ) {
if (fname)
{
fname[size] = '\0';
if ( ( *filename = strdup(fname) ) == NULL )
if ((*filename = strdup (fname)) == NULL)
ret = ENOMEM;
} else
}
else
ret = ENOENT;
}
return ret;
}
int message_save_attachment(message_t msg, const char *filename, void **data)
int
message_save_attachment (message_t msg, const char *filename, void **data)
{
stream_t istream;
struct _msg_info *info = NULL;
......@@ -244,53 +283,77 @@ int message_save_attachment(message_t msg, const char *filename, void **data)
char *content_encoding;
const char *fname = NULL;
if ( msg == NULL || filename == NULL)
if (msg == NULL || filename == NULL)
return EINVAL;
if ( ( ret = _attachment_setup( &info, msg, &istream, data) ) != 0 )
if ((ret = _attachment_setup (&info, msg, &istream, data)) != 0)
return ret;
if ( ret == 0 && ( ret = message_get_header(msg, &hdr) ) == 0 ) {
if ( filename == NULL )
ret = message_attachment_filename(msg, &fname);
if (ret == 0 && (ret = message_get_header (msg, &hdr)) == 0)
{
if (filename == NULL)
ret = message_attachment_filename (msg, &fname);
else
fname = filename;
if ( fname && ( ret = file_stream_create(&info->fstream, fname, MU_STREAM_WRITE|MU_STREAM_CREAT) ) == 0 ) {
if ( ( ret = stream_open(info->fstream) ) == 0 ) {
header_get_value(hdr, "Content-Transfer-Encoding", NULL, 0, &size);
if ( size ) {
if ( ( content_encoding = alloca(size+1) ) == NULL )
if (fname
&& (ret =
file_stream_create (&info->fstream, fname,
MU_STREAM_WRITE | MU_STREAM_CREAT)) == 0)
{
if ((ret = stream_open (info->fstream)) == 0)
{
header_get_value (hdr, "Content-Transfer-Encoding", NULL, 0,
&size);
if (size)
{
if ((content_encoding = alloca (size + 1)) == NULL)
ret = ENOMEM;
header_get_value(hdr, "Content-Transfer-Encoding", content_encoding, size+1, 0);
} else
content_encoding = (char *)"7bit";
ret = filter_create(&info->stream, istream, content_encoding, MU_FILTER_DECODE, MU_STREAM_READ);
}
}
header_get_value (hdr, "Content-Transfer-Encoding",
content_encoding, size + 1, 0);
}
if ( info->stream && istream ) {
if ( info->nbytes )
memmove( info->buf, info->buf + (BUF_SIZE - info->nbytes), info->nbytes);
while ( (ret == 0 && info->nbytes) || ( ( ret = stream_read(info->stream, info->buf, BUF_SIZE, info->ioffset, &info->nbytes) ) == 0 && info->nbytes ) ) {
else
content_encoding = (char *) "7bit";
ret =
filter_create (&info->stream, istream, content_encoding,
MU_FILTER_DECODE, MU_STREAM_READ);
}
}
}
if (info->stream && istream)
{
if (info->nbytes)
memmove (info->buf, info->buf + (BUF_SIZE - info->nbytes),
info->nbytes);
while ((ret == 0 && info->nbytes)
||
((ret =
stream_read (info->stream, info->buf, BUF_SIZE, info->ioffset,
&info->nbytes)) == 0 && info->nbytes))
{
info->ioffset += info->nbytes;
while( info->nbytes ) {
if ( ( ret = stream_write(info->fstream, info->buf, info->nbytes, info->ooffset, &nbytes ) ) != 0 )
while (info->nbytes)
{
if ((ret =
stream_write (info->fstream, info->buf, info->nbytes,
info->ooffset, &nbytes)) != 0)
break;
info->nbytes -= nbytes;
info->ooffset += nbytes;
}
}
}
if ( ret != EAGAIN && info ) {
stream_close(info->fstream);
stream_destroy(&info->stream, NULL);
stream_destroy(&info->fstream, NULL);
_attachment_free(info, ret);
if (ret != EAGAIN && info)
{
stream_close (info->fstream);
stream_destroy (&info->stream, NULL);
stream_destroy (&info->fstream, NULL);
_attachment_free (info, ret);
}
return ret;
}
int message_encapsulate(message_t msg, message_t *newmsg, void **data)
int
message_encapsulate (message_t msg, message_t * newmsg, void **data)
{
stream_t istream, ostream;
const char *header;
......@@ -299,26 +362,40 @@ int message_encapsulate(message_t msg, message_t *newmsg, void **data)
size_t nbytes;
body_t body;
if ( msg == NULL || newmsg == NULL)
if (msg == NULL || newmsg == NULL)
return EINVAL;
if ( ( ret = _attachment_setup( &info, msg, &ostream, data) ) != 0 )
if ((ret = _attachment_setup (&info, msg, &ostream, data)) != 0)
return ret;
if ( info->msg == NULL && ( ret = message_create(&(info->msg), NULL) ) == 0 ) {
header = "Content-Type: message/rfc822\nContent-Transfer-Encoding: 7bit\n\n";
if ( ( ret = header_create( &(info->hdr), header, strlen(header), msg ) ) == 0 )
ret = message_set_header(info->msg, info->hdr, NULL);
}
if ( ret == 0 && ( ret = message_get_stream(msg, &istream ) ) == 0 ) {
if ( ( ret = message_get_body(info->msg, &body) ) == 0 &&
( ret = body_get_stream(body, &ostream) ) == 0 ) {
if ( info->nbytes )
memmove( info->buf, info->buf + (BUF_SIZE - info->nbytes), info->nbytes);
while ( (ret == 0 && info->nbytes) || ( ( ret = stream_read(istream, info->buf, BUF_SIZE, info->ioffset, &info->nbytes) ) == 0 && info->nbytes ) ) {
if (info->msg == NULL && (ret = message_create (&(info->msg), NULL)) == 0)
{
header =
"Content-Type: message/rfc822\nContent-Transfer-Encoding: 7bit\n\n";
if ((ret =
header_create (&(info->hdr), header, strlen (header), msg)) == 0)
ret = message_set_header (info->msg, info->hdr, NULL);
}
if (ret == 0 && (ret = message_get_stream (msg, &istream)) == 0)
{
if ((ret = message_get_body (info->msg, &body)) == 0 &&
(ret = body_get_stream (body, &ostream)) == 0)
{
if (info->nbytes)
memmove (info->buf, info->buf + (BUF_SIZE - info->nbytes),
info->nbytes);
while ((ret == 0 && info->nbytes)
||
((ret =
stream_read (istream, info->buf, BUF_SIZE, info->ioffset,
&info->nbytes)) == 0 && info->nbytes))
{
info->ioffset += info->nbytes;
while( info->nbytes ) {
if ( ( ret = stream_write(ostream, info->buf, info->nbytes, info->ooffset, &nbytes ) ) != 0 )
while (info->nbytes)
{
if ((ret =
stream_write (ostream, info->buf, info->nbytes,
info->ooffset, &nbytes)) != 0)
break;
info->nbytes -= nbytes;
info->ooffset += nbytes;
......@@ -326,14 +403,15 @@ int message_encapsulate(message_t msg, message_t *newmsg, void **data)
}
}
}
if ( ret == 0 )
if (ret == 0)
*newmsg = info->msg;
if ( ret != EAGAIN && info )
_attachment_free(info, ret);
if (ret != EAGAIN && info)
_attachment_free (info, ret);
return ret;
}
int message_unencapsulate(message_t msg, message_t *newmsg, void **data)
int
message_unencapsulate (message_t msg, message_t * newmsg, void **data)
{
size_t size, nbytes;
int ret = 0;
......@@ -342,41 +420,58 @@ int message_unencapsulate(message_t msg, message_t *newmsg, void **data)
stream_t istream, ostream;
struct _msg_info *info = NULL;
if ( msg == NULL || newmsg == NULL)
if (msg == NULL || newmsg == NULL)
return EINVAL;
if ( (data == NULL || *data == NULL ) && ( ret = message_get_header(msg, &hdr) ) == 0 ) {
header_get_value(hdr, "Content-Type", NULL, 0, &size);
if ( size ) {
if ( ( content_type = alloca(size+1) ) == NULL )
if ((data == NULL || *data == NULL)
&& (ret = message_get_header (msg, &hdr)) == 0)
{
header_get_value (hdr, "Content-Type", NULL, 0, &size);
if (size)
{
if ((content_type = alloca (size + 1)) == NULL)
return ENOMEM;
header_get_value(hdr, "Content-Type", content_type, size+1, 0);
if ( strncasecmp(content_type, "message/rfc822", strlen("message/rfc822")) != 0 )
header_get_value (hdr, "Content-Type", content_type, size + 1, 0);
if (strncasecmp
(content_type, "message/rfc822",
strlen ("message/rfc822")) != 0)
return EINVAL;
} else
}
else
return EINVAL;
}
if ( ( ret = _attachment_setup( &info, msg, &istream, data) ) != 0 )
if ((ret = _attachment_setup (&info, msg, &istream, data)) != 0)
return ret;
if ( info->msg == NULL )
ret = message_create(&(info->msg), NULL);
if ( ret == 0 ) {
message_get_stream(info->msg, &ostream);
if ( info->nbytes )
memmove( info->buf, info->buf + (BUF_SIZE - info->nbytes), info->nbytes);
while ( (ret == 0 && info->nbytes) || ( ( ret = stream_read(istream, info->buf, BUF_SIZE, info->ioffset, &info->nbytes) ) == 0 && info->nbytes ) ) {
if (info->msg == NULL)
ret = message_create (&(info->msg), NULL);
if (ret == 0)
{
message_get_stream (info->msg, &ostream);
if (info->nbytes)
memmove (info->buf, info->buf + (BUF_SIZE - info->nbytes),
info->nbytes);
while ((ret == 0 && info->nbytes)
||
((ret =
stream_read (istream, info->buf, BUF_SIZE, info->ioffset,
&info->nbytes)) == 0 && info->nbytes))
{
info->ioffset += info->nbytes;
while( info->nbytes ) {
if ( ( ret = stream_write(ostream, info->buf, info->nbytes, info->ooffset, &nbytes ) ) != 0 )
while (info->nbytes)
{
if ((ret =
stream_write (ostream, info->buf, info->nbytes,
info->ooffset, &nbytes)) != 0)
break;
info->nbytes -= nbytes;
info->ooffset += nbytes;
}
}
}
if ( ret == 0 )
if (ret == 0)
*newmsg = info->msg;
if ( ret != EAGAIN && info )
_attachment_free(info, ret);
if (ret != EAGAIN && info)
_attachment_free (info, ret);
return ret;
}
......