#include "citadel.h"
#include "server.h"
#include <errno.h>
-#include "proto.h"
+#include <sys/stat.h>
+#include "database.h"
+#include "msgbase.h"
+#include "support.h"
+#include "sysdep_decls.h"
+#include "room_ops.h"
+#include "user_ops.h"
+#include "control.h"
+#include "dynloader.h"
#define MSGS_ALL 0
#define MSGS_OLD 1
fclose(fp);
goto DETYPE;
}
- if (strucmp(name,aaa)) goto GNA;
+ 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) {
if (fp==NULL) return(M_ERROR);
GETSN: do {
a=getstring(fp,aaa);
- } while ((a>=0)&&(strucmp(aaa,bbb)));
+ } while ((a>=0)&&(strcasecmp(aaa,bbb)));
a=getstring(fp,aaa);
if (!strncmp(aaa,"use ",4)) {
strcpy(bbb,&aaa[4]);
mode = MSGS_ALL;
strcat(which," ");
- if (!struncmp(which,"OLD",3)) mode = MSGS_OLD;
- if (!struncmp(which,"NEW",3)) mode = MSGS_NEW;
- if (!struncmp(which,"FIRST",5)) {
+ if (!strncasecmp(which,"OLD",3)) mode = MSGS_OLD;
+ if (!strncasecmp(which,"NEW",3)) mode = MSGS_NEW;
+ if (!strncasecmp(which,"FIRST",5)) {
mode = MSGS_FIRST;
cm_howmany = extract_int(cmdbuf,1);
}
- if (!struncmp(which,"LAST",4)) {
+ if (!strncasecmp(which,"LAST",4)) {
mode = MSGS_LAST;
cm_howmany = extract_int(cmdbuf,1);
}
- if (!struncmp(which,"GT",2)) {
+ if (!strncasecmp(which,"GT",2)) {
mode = MSGS_GT;
cm_gt = extract_long(cmdbuf,1);
}
void output_message(char *msgid, int mode, int headers_only)
{
long msg_num;
- int a,och,len;
+ int a;
CIT_UBYTE ch, rch;
- FILE *msg;
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);
} while (rch > 0);
if (ch=='A') {
+ PerformUserHooks(buf, (-1L), EVT_OUTPUTMSG);
if (anon_flag==MES_ANON) cprintf("from=****");
else if (anon_flag==MES_AN2) cprintf("from=anonymous");
else cprintf("from=%s",buf);
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 (mode == MT_RFC822) {
- if (!strucmp(snode, NODENAME)) {
+ if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
cprintf("Message-ID: <%s@%s>\n", mid, snode);
+ PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
cprintf("From: %s@%s (%s)\n",
suser, snode, luser);
cprintf("Organization: %s\n", lnode);
if (ch==0) {
cprintf("text\n*** ?Message truncated\n000\n");
- fclose(msg);
cdb_free(dmsgtext);
return;
}
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);
cprintf("000\n");
- fclose(msg);
cdb_free(dmsgtext);
return;
}
* 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 ( (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, "");
}
- if (len>=250) {
- len = 0;
- /* cprintf("%c", ch); */
- cprintf("%c", 10);
+ 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
* Message base operation to send a message to the master file
* (returns new message number)
*/
-long send_message(char *filename, int generate_id)
- /* tempfilename of proper message */
- /* set to 1 to generate an 'I' field */
-{
+long send_message(char *message_in_memory, /* pointer to buffer */
+ size_t message_length, /* length of buffer */
+ int generate_id) { /* 1 to generate an I field */
- FILE *fp;
long newmsgid;
- char *message_in_memory;
- size_t templen;
-
- fp = fopen(filename, "rb");
-
- /* Measure the message */
- lprintf(9, "Measuring the message\n");
- fseek(fp, 0L, SEEK_END);
- templen = ftell(fp);
-
- /* Now read it into memory */
- lprintf(9, "Allocating %ld bytes\n", templen);
- message_in_memory = (char *) malloc(templen);
- if (message_in_memory == NULL) {
- lprintf(2, "Can't allocate memory to save message!\n");
- fclose(fp);
- return 0L;
- }
-
- lprintf(9, "Reading it into memory\n");
- fseek(fp, 0L, SEEK_SET);
- fread(message_in_memory, templen, 1, fp);
- fclose(fp);
-
/* Get a new message number */
newmsgid = get_new_message_number();
lprintf(9, "Storing message %ld\n", newmsgid);
begin_critical_section(S_MSGMAIN);
if ( cdb_store(CDB_MSGMAIN, &newmsgid, sizeof(long),
- message_in_memory, templen) < 0 ) {
+ message_in_memory, message_length) < 0 ) {
lprintf(2, "Can't store message\n");
end_critical_section(S_MSGMAIN);
- free(message_in_memory);
return 0L;
}
end_critical_section(S_MSGMAIN);
- free(message_in_memory);
-
/* Finally, return the pointers */
return(newmsgid);
/* first try to locate the twit room */
for (a=0; a<MAXROOMS; ++a) {
getroom(&qrbuf,a);
- if (!strucmp(qrbuf.QRname,config.c_twitroom)) {
+ if (!strcasecmp(qrbuf.QRname,config.c_twitroom)) {
twitroom = a;
return;
}
long *dmailbox;
int dnum_mails;
long newmsgid;
+ char *message_in_memory;
+ struct stat statbuf;
+ size_t templen;
+ FILE *fp;
+
+ /* Measure the message */
+ lprintf(9, "Measuring the message\n");
+ stat(mtmp, &statbuf);
+ templen = statbuf.st_size;
+
+ /* Now read it into memory */
+ lprintf(9, "Allocating %ld bytes\n", templen);
+ message_in_memory = (char *) malloc(templen);
+ if (message_in_memory == NULL) {
+ lprintf(2, "Can't allocate memory to save message!\n");
+ return;
+ }
+
+ lprintf(9, "Reading it into memory\n");
+ fp = fopen(mtmp, "rb");
+ fread(message_in_memory, templen, 1, fp);
+ fclose(fp);
- newmsgid = send_message(mtmp,generate_id);
+ newmsgid = send_message(message_in_memory, templen, generate_id);
+ free(message_in_memory);
if (newmsgid <= 0L) return;
hold_rm=(-1);
- /* if the user is a twit, move to the twit room for posting */
+ /* If the user is a twit, move to the twit room for posting... */
if (TWITDETECT) if (CC->usersupp.axlevel==2) {
if (twitroom<0) loadtroom();
hold_rm=CC->curr_rm;
CC->curr_rm=twitroom;
}
- /* and if this message is destined for Aide> then go there */
+ /* ...or if this message is destined for Aide> then go there. */
if (mtsflag) {
hold_rm=CC->curr_rm;
CC->curr_rm=2;
}
- /* this call to usergoto() changes rooms if necessary. It also
- causes the latest message list to be read into memory */
+ /* This call to usergoto() changes rooms if necessary. It also
+ * causes the latest message list to be read into memory.
+ */
usergoto(CC->curr_rm,0);
/* Store the message pointer, but NOT for sent mail! */
}
/* Bump this user's messages posted counter. Also, if the user is a
- twit, give them access to the twit room. */
+ * twit, give them access to the twit room.
+ */
lgetuser(&CC->usersupp,CC->curr_user);
CC->usersupp.posted = CC->usersupp.posted + 1;
- if (CC->curr_rm==twitroom) CC->usersupp.generation[twitroom]=CC->quickroom.QRgen;
- lputuser(&CC->usersupp,CC->curr_user);
+ if (CC->curr_rm==twitroom) {
+ CC->usersupp.generation[twitroom] = CC->quickroom.QRgen;
+ }
+ lputuser(&CC->usersupp, CC->curr_user);
- /* if mail, there's still more to do, if not, skip it */
+ /* If mail, there's still more to do, if not, skip it. */
if ((CC->curr_rm!=1)||(mtsflag)) goto ENTFIN;
- /* network mail - send a copy to the network program */
+ /* Network mail - send a copy to the network program. */
if (mailtype!=M_LOCAL) {
sprintf(aaa,"./network/spoolin/nm.%d",getpid());
copy_file(mtmp,aaa);
system("exec nohup ./netproc >/dev/null 2>&1 &");
}
- /* local mail - put a copy in the recipient's mailbox */
+ /* Local mail - put a copy in the recipient's mailbox. */
/* FIX here's where we have to handle expiry, stuffed boxes, etc. */
- if (mailtype==M_LOCAL) {
+ if (mailtype == M_LOCAL) {
if (lgetuser(&tempUS,rec)==0) {
- cdbmb = cdb_fetch(CDB_MAILBOXES, &tempUS.usernum, sizeof(long));
+ cdbmb = cdb_fetch(CDB_MAILBOXES,
+ &tempUS.usernum, sizeof(long));
if (cdbmb != NULL) {
memcpy(dmailbox, cdbmb->ptr, cdbmb->len);
dnum_mails = cdbmb->len / sizeof(long);
}
}
- /* if we've posted in a room other than the current room, then we
- have to now go back to the current room... */
+ /* If we've posted in a room other than the current room, then we
+ * have to now go back to the current room...
+ */
ENTFIN: if (hold_rm!=(-1)) {
usergoto(hold_rm,0);
}
/*
- * generate an administrative message and post it in the Aide> room
+ * Generate an administrative message and post it in the Aide> room.
*/
void aide_message(char *text)
{
/*
- * build a binary message to be saved on disk
+ * 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;
char dest_node[32];
char buf[256];
- /* don't confuse the poor folks if it's not routed mail. */
- strcpy(dest_node,"");
+ /* Don't confuse the poor folks if it's not routed mail. */
+ strcpy(dest_node, "");
- /* if net_type is M_BINARY, split out the destination node */
+ /* If net_type is M_BINARY, split out the destination node. */
if (net_type == M_BINARY) {
strcpy(dest_node,NODENAME);
for (a=0; a<strlen(recipient); ++a) {
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. */
ERROR+HIGHER_ACCESS_REQUIRED);
return;
}
- if (!strucmp(buf,"sysop")) {
+ if (!strcasecmp(buf,"sysop")) {
mtsflag=1;
goto SKFALL;
}
if (e!=M_LOCAL) goto SKFALL; /* don't search local file */
- if (!strucmp(buf,CC->usersupp.fullname)) {
+ if (!strcasecmp(buf,CC->usersupp.fullname)) {
cprintf("%d Can't send mail to yourself!\n",
ERROR+NO_SUCH_USER);
return;
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;
targ_slot = (-1);
for (a=0; a<MAXROOMS; ++a) {
getroom(&qtemp,a);
- if (!strucmp(qtemp.QRname,targ)) {
+ if (!strcasecmp(qtemp.QRname,targ)) {
targ_slot = a;
a = MAXROOMS;
}
projects / citadel.git / blobdiff