* IGnet delivery is broken

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index b4ed04e1f26fad003dfeb477b0cbb07de4d17d53..4c91cd80777c0c39adb78dbc72e9177f0705805b 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -187,6 +187,7 @@ GETSN:              do {
                        while (bbb[strlen(bbb) - 1] == '_')
                                bbb[strlen(bbb) - 1] = 0;
                        sprintf(name, &aaa[4], bbb);
+                       lprintf(9, "returning MES_INTERNET\n");
                        return (MES_INTERNET);
                }
                if (!strncmp(aaa, "bin", 3)) {
@@ -203,10 +204,12 @@ GETSN:            do {
                        while (bbb[0] == ' ')
                                strcpy(bbb, &bbb[1]);
                        sprintf(name, "%s @%s", aaa, bbb);
+                       lprintf(9, "returning MES_BINARY\n");
                        return (MES_BINARY);
                }
                return (MES_ERROR);
        }
+       lprintf(9, "returning MES_LOCAL\n");
        return (MES_LOCAL);
 }
 
@@ -468,7 +471,8 @@ void do_help_subst(char *buffer)
 void memfmout(
        int width,              /* screen width to use */
        char *mptr,             /* where are we going to get our text from? */
-       char subst)             /* nonzero if we should do substitutions */
+       char subst,             /* nonzero if we should do substitutions */
+       char *nl)               /* string to terminate lines with */
 {
        int a, b, c;
        int real = 0;
@@ -507,7 +511,7 @@ FMTA:       if (subst) {
        if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
                ch = 32;
        if (((old == 13) || (old == 10)) && (isspace(real))) {
-               cprintf("\n");
+               cprintf("%s", nl);
                c = 1;
        }
        if (ch > 126)
@@ -515,7 +519,7 @@ FMTA:       if (subst) {
 
        if (ch > 32) {
                if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
-                       cprintf("\n%s", aaa);
+                       cprintf("%s%s", nl, aaa);
                        c = strlen(aaa);
                        aaa[0] = 0;
                }
@@ -525,7 +529,7 @@ FMTA:       if (subst) {
        }
        if (ch == 32) {
                if ((strlen(aaa) + c) > (width - 5)) {
-                       cprintf("\n");
+                       cprintf("%s", nl);
                        c = 1;
                }
                cprintf("%s ", aaa);
@@ -535,14 +539,14 @@ FMTA:     if (subst) {
                goto FMTA;
        }
        if ((ch == 13) || (ch == 10)) {
-               cprintf("%s\n", aaa);
+               cprintf("%s%s", aaa, nl);
                c = 1;
                strcpy(aaa, "");
                goto FMTA;
        }
        goto FMTA;
 
-FMTEND:        cprintf("%s\n", aaa);
+FMTEND:        cprintf("%s%s", aaa, nl);
 }
 
 
@@ -1049,7 +1053,7 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
         * message to the reader's screen width.
         */
        if (TheMessage->cm_format_type == FMT_CITADEL) {
-               memfmout(80, mptr, 0);
+               memfmout(80, mptr, 0, nl);
        }
 
        /* If the message on disk is format 4 (MIME), we've gotta hand it
@@ -1475,7 +1479,7 @@ int ReplicationChecks(struct CtdlMessage *msg) {
 long CtdlSaveMsg(struct CtdlMessage *msg,      /* message to save */
                char *rec,                      /* Recipient (mail) */
                char *force,                    /* force a particular room? */
-               int mailtype,                   /* local or remote type */
+               int supplied_mailtype,          /* local or remote type */
                int generate_id)                /* 1 = generate 'I' field */
 {
        char aaa[100];
@@ -1493,9 +1497,11 @@ long CtdlSaveMsg(struct CtdlMessage *msg,        /* message to save */
        static int seqnum = 1;
        struct CtdlMessage *imsg;
        char *instr;
+       int mailtype;
 
        lprintf(9, "CtdlSaveMsg() called\n");
        if (is_valid_message(msg) == 0) return(-1);     /* self check */
+       mailtype = supplied_mailtype;
 
        /* If this message has no timestamp, we take the liberty of
         * giving it one, right now.
@@ -1539,6 +1545,7 @@ long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
                           == hostalias_localhost) {
                                recipient[a] = 0;
                                lprintf(7, "Changed to <%s>\n", recipient);
+                               mailtype = MES_LOCAL;
                        }
                }
        }
@@ -1659,7 +1666,10 @@ long CtdlSaveMsg(struct CtdlMessage *msg,        /* message to save */
         * is no local sender; it would otherwise go to the Trashcan).
         */
        if ((!CC->internal_pgm) || (strlen(recipient) == 0)) {
-               CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
+               if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) {
+                       lprintf(3, "ERROR saving message pointer!\n");
+                       CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+               }
        }
 
        /* For internet mail, drop a copy in the outbound queue room */
@@ -1682,6 +1692,11 @@ long CtdlSaveMsg(struct CtdlMessage *msg,        /* message to save */
                        MailboxName(actual_rm, &userbuf, MAILROOM);
                        CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
                }
+               else {
+                       lprintf(9, "No user <%s>, saving in %s> instead\n",
+                               recipient, AIDEROOM);
+                       CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+               }
        }
 
        /* Perform "after save" hooks */