*
*/
+#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
-#include <fcntl.h> /* stu */
#include <stdio.h>
#include <signal.h>
#include <sys/types.h>
#include <ctype.h>
#include <string.h>
#include <sys/stat.h>
+#include <errno.h>
+#ifdef HAVE_PTHREAD_H
#include <pthread.h>
+#endif
#include "citadel.h"
#include "mime_parser.h"
#include "sysdep_decls.h"
void mime_decode(char *partnum,
char *part_start, size_t length,
char *content_type, char *encoding,
+ char *disposition,
char *name, char *filename,
void (*CallBack)
(char *cbname,
char *cbfilename,
char *cbpartnum,
+ char *cbdisp,
void *cbcontent,
char *cbtype,
size_t cblength)
size_t blocksize;
int write_error = 0;
+ lprintf(9, "mime_decode() called\n");
- int stu;
- int stu2 = 0;
-
+ /* Some encodings aren't really encodings */
+ if (!strcasecmp(encoding, "7bit")) strcpy(encoding, "");
+ if (!strcasecmp(encoding, "8bit")) strcpy(encoding, "");
+ if (!strcasecmp(encoding, "binary")) strcpy(encoding, "");
/* If this part is not encoded, send as-is */
if (strlen(encoding)==0) {
- CallBack(name, filename, partnum, part_start,
+ CallBack(name, filename, partnum, disposition, part_start,
content_type, length);
return;
}
if ( (strcasecmp(encoding, "base64"))
- && (strcasecmp(encoding, "7bit")) ) {
+ && (strcasecmp(encoding, "quoted-printable")) ) {
lprintf(5, "ERROR: unknown MIME encoding '%s'\n", encoding);
return;
}
* Allocate a buffer for the decoded data. The output buffer is the
* same size as the input buffer; this assumes that the decoded data
* will never be larger than the encoded data. This is a safe
- * assumption with base64, uuencode, and quoted-printable.
+ * assumption with base64, uuencode, and quoted-printable. Just to
+ * be safe, we still pad the buffer a bit.
*/
- decoded = mallok(length);
+ decoded = mallok(length + 1024);
if (decoded == NULL) {
lprintf(5, "ERROR: cannot allocate memory.\n");
return;
if (pipe(recvpipe) != 0) return;
childpid = fork();
- lprintf(9, "fork() returned %d\n", childpid);
if (childpid < 0) {
phree(decoded);
return;
}
if (childpid == 0) {
- /* close(2); FIX uncomment this when solid */
+ close(2);
/* send stdio to the pipes */
if (dup2(sendpipe[0], 0)<0) lprintf(5, "ERROR dup2()\n");
if (dup2(recvpipe[1], 1)<0) lprintf(5, "ERROR dup2()\n");
close(sendpipe[1]); /* Close the ends we're not using */
close(recvpipe[0]);
if (!strcasecmp(encoding, "base64"))
- execlp("/usr/local/base64/base64", "base64", "-d", NULL);
- else if (!strcasecmp(encoding, "7bit"))
- execlp("/bin/dd", "dd", NULL);
+ execlp("./base64", "base64", "-d", NULL);
+ else if (!strcasecmp(encoding, "quoted-printable"))
+ execlp("./qpdecode", "qpdecode", NULL);
lprintf(5, "ERROR: cannot exec decoder for %s\n", encoding);
exit(1);
}
close(sendpipe[0]); /* Close the ends we're not using */
close(recvpipe[1]);
- lprintf(9, "ready to send %d bytes\n", length);
-
while ( (bytes_sent < length) && (write_error == 0) ) {
/* Empty the input pipe FIRST */
while (fstat(recvpipe[0], &statbuf), (statbuf.st_size > 0) ) {
bytes_recv = bytes_recv + blocksize;
}
- lprintf(9, "Decoded length = %d\n", bytes_recv);
-
- if (strlen(filename) ==0) sprintf(filename, "noname%d", stu2++);
- chdir("stu");
- stu = creat(filename, 0666);
- write(stu, decoded, bytes_recv);
- close(stu);
- chdir("..");
-
if (bytes_recv > 0)
- CallBack(name, filename, partnum, decoded,
+ CallBack(name, filename, partnum, disposition, decoded,
content_type, bytes_recv);
+
phree(decoded);
}
(char *cbname,
char *cbfilename,
char *cbpartnum,
+ char *cbdisp,
void *cbcontent,
char *cbtype,
size_t cblength)
char endary[256];
char content_type[256];
char encoding[256];
+ char disposition[256];
char name[256];
char filename[256];
int is_multipart;
size_t length;
char nested_partnum[256];
+ lprintf(9, "the_mime_parser() called\n");
ptr = content_start;
memset(boundary, 0, sizeof boundary);
memset(content_type, 0, sizeof content_type);
extract_key(name, content_type, "name");
}
if (!strncasecmp(header, "Content-Disposition: ", 21)) {
- extract_key(filename, header, "filename");
+ strcpy(disposition, &header[21]);
+ extract_key(filename, disposition, "filename");
}
if (!strncasecmp(header,
"Content-transfer-encoding: ", 27))
strcat(header, buf);
} while ((strlen(buf) > 0) && (*ptr != 0));
+ for (i=0; i<strlen(disposition); ++i)
+ if (disposition[i]==';') disposition[i] = 0;
for (i=0; i<strlen(content_type); ++i)
if (content_type[i]==';') content_type[i] = 0;
}
mime_decode(partnum,
part_start, length,
- content_type, encoding,
+ content_type, encoding, disposition,
name, filename, CallBack);
}
(char *cbname,
char *cbfilename,
char *cbpartnum,
+ char *cbdisp,
void *cbcontent,
char *cbtype,
size_t cblength)
) {
+ lprintf(9, "mime_parser() called\n");
the_mime_parser("1", content_start, content_end, CallBack);
}