if (strcasecmp(name,aaa)) goto GNA;
fclose(fp);
strcpy(name,bbb);
- /* cprintf("*** Mail is being forwarded to %s\n",name); */
+ lprintf(7, "Mail is being forwarded to %s\n", name);
DETYPE: /* determine local or remote type, see citadel.h */
for (a=0; a<strlen(name); ++a) if (name[a]=='!') return(M_INTERNET);
if (name[b]=='.') return(M_INTERNET);
b=0; for (a=0; a<strlen(name); ++a) if (name[a]=='@') ++b;
if (b>1) {
- /* cprintf("Too many @'s in address\n"); */
+ lprintf(7, "Too many @'s in address\n");
return(M_ERROR);
}
if (b==1) {
void output_message(char *msgid, int mode, int headers_only)
{
long msg_num;
- int a,och,len;
+ int a;
CIT_UBYTE ch, rch;
CIT_UBYTE format_type,anon_flag;
char buf[1024];
long msg_len;
int msg_ok = 0;
+ char boundary[256]; /* attachment boundary */
+ char current_section = 0; /* section currently being parsed */
+ char desired_section = 0; /* section desired for printing */
+ int has_attachments = 0;
struct cdbdata *dmsgtext;
char *mptr;
long xtime;
/* */
+ strcpy(boundary, "");
msg_num = atol(msgid);
cprintf(" [%s]",buf);
cprintf("\n");
}
+ else if (ch=='Z') {
+ has_attachments = 1;
+ sprintf(boundary, "--%s", buf);
+ }
else if (ch=='P') cprintf("path=%s\n",buf);
else if (ch=='U') cprintf("subj=%s\n",buf);
else if (ch=='I') cprintf("msgn=%s\n",buf);
if (headers_only) {
/* give 'em a length */
msg_len = 0L;
- while(och=ch, ch = *mptr++, ch>0) {
+ while(ch = *mptr++, ch>0) {
++msg_len;
}
cprintf("mlen=%ld\n", msg_len);
* what message transfer format is in use.
*/
if (format_type == 1) {
- och = 0;
- len = 0;
- while(och=ch, ch = *mptr++, ch>0) {
+ strcpy(buf, "");
+ while(ch = *mptr++, ch>0) {
if (ch == 13) ch = 10;
- ++len;
- /* if ((ch!=10)||(och!=10)) { */
- cprintf("%c", ch);
- if (ch==10) len = 0;
- /* } */
- if (len>=250) {
- len = 0;
- /* cprintf("%c", ch); */
- cprintf("%c", 10);
+ if ( (ch == 10) || (strlen(buf)>250) ) {
+ if (has_attachments) if (!strncmp(buf, boundary, strlen(boundary))) {
+ ++current_section;
+ }
+ if (current_section == desired_section) {
+ if ( (has_attachments == 0) || (strncmp(buf, boundary, strlen(boundary)))) {
+ cprintf("%s\n", buf);
+ }
+ }
+ strcpy(buf, "");
+ }
+ else {
+ buf[strlen(buf)+1] = 0;
+ buf[strlen(buf)] = ch;
}
}
- if (len!=0) cprintf("%c", 10);
+ if (strlen(buf)>0) cprintf("%s\n", buf);
}
/* If the message on disk is format 0 (Citadel vari-format), we
* output using the formatter at 80 columns. This is the final output
/*
* Build a binary message to be saved on disk.
*/
-void make_message(char *filename, struct usersupp *author, char *recipient, char *room, int type, int net_type, int format_type, char *fake_name)
- /* temporary file name */
- /* author's usersupp structure */
- /* NULL if it's not mail */
- /* room where it's going */
- /* see MES_ types in header file */
- /* local or remote type, see citadel.h */
- /* format type (see citadel.h) */
-{
+void make_message(
+ char *filename, /* temporary file name */
+ struct usersupp *author, /* author's usersupp structure */
+ char *recipient, /* NULL if it's not mail */
+ char *room, /* room where it's going */
+ int type, /* see MES_ types in header file */
+ int net_type, /* see MES_ types in header file */
+ int format_type, /* local or remote (see citadel.h) */
+ char *fake_name, /* who we're masquerading as */
+ char *boundary) { /* boundary (if exist attachments) */
+
FILE *fp;
int a;
long now;
fprintf(fp,"N%s%c",NODENAME,0); /* nodename */
fprintf(fp,"H%s%c",HUMANNODE,0); /* human nodename */
- if (recipient[0]!=0) fprintf(fp,"R%s%c",recipient,0);
- if (dest_node[0]!=0) fprintf(fp,"D%s%c",dest_node,0);
+ if (recipient[0]!=0) fprintf(fp, "R%s%c", recipient, 0);
+ if (dest_node[0]!=0) fprintf(fp, "D%s%c", dest_node, 0);
+ if (boundary[0]!=0) fprintf(fp, "Z%s%c", boundary, 0);
putc('M',fp);
int anon_flag = 0;
int format_type = 0;
char newusername[256]; /* <bc> */
+ char boundary[256];
int a,b,e;
int mtsflag = 0;
extract(recipient,entargs,1);
anon_flag = extract_int(entargs,2);
format_type = extract_int(entargs,3);
+ extract(boundary, entargs, 4);
/* first check to make sure the request is valid. */
cprintf("%d send message\n",SEND_LISTING);
if (CC->fake_postname[0])
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_postname);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_postname, boundary);
else
if (CC->fake_username[0])
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_username);
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, CC->fake_username, boundary);
else
- make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, "");
+ make_message(CC->temp,&CC->usersupp,buf,CC->quickroom.QRname,b,e,format_type, "", boundary);
save_message(CC->temp,buf,mtsflag,e,1);
CC->fake_postname[0]='\0';
return;
projects / citadel.git / blobdiff