fix namespace collision with <sys/stream.h> on certain SYSV variants

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 38420a8eb3925a9ed6c4b266997568d00ac1dcb1..573929ef700ba9aa1b2ffe22689666e63a714240 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -173,10 +173,10 @@ struct quickroom {
 #define MES_ANON       66              /* "****" header                    */
 #define MES_AN2                67              /* "Anonymous" header               */
 
-#define M_ERROR                (-1)    /* Can't send message due to bad address   */
-#define M_LOCAL                0       /* Local message, do no network processing */
-#define M_INTERNET     1       /* Convert msg and send as Internet mail   */
-#define M_BINARY       2       /* Process recipient and send via C/UX net */
+#define MES_ERROR      (-1)    /* Can't send message due to bad address   */
+#define MES_LOCAL      0       /* Local message, do no network processing */
+#define MES_INTERNET   1       /* Convert msg and send as Internet mail   */
+#define MES_BINARY     2       /* Process recipient and send via C/UX net */
 
 /****************************************************************************/
 

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 48519eef8b1b5fe809635a323f8dc6e6365e811e..297164554d157478ef9a5272b73dd4c5be62caf7 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -186,7 +186,7 @@ void cmd_netf(char *cmdbuf)
                }
        snprintf(buf,sizeof buf,"sysop@%s",destsys);
        e=alias(buf);
-       if (e!=M_BINARY) {
+       if (e!=MES_BINARY) {
                cprintf("%d No such system: '%s'\n",
                        ERROR+NO_SUCH_SYSTEM,destsys);
                return;
@@ -562,7 +562,7 @@ void cmd_ucls(char *cmd)
                fprintf(fp,"NEW UPLOAD: '%s'\n %s\n",CC->upl_file,CC->upl_comment);
                putc(0,fp);
                fclose(fp);
-               save_message(CC->temp, "", "", M_LOCAL, 1);
+               save_message(CC->temp, "", "", MES_LOCAL, 1);
 
                }
        else {

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index da663996ea88977d1d9278efc3d2a0c58ea2a75e..4b2c9ed850cba46ba7e790739fec025329bd3c70 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -73,7 +73,7 @@ int alias(char *name)         /* process alias and routing info for mail */
 
        fp=fopen("network/mail.aliases","r");
        if (fp==NULL) fp=fopen("/dev/null","r");
-       if (fp==NULL) return(M_ERROR);
+       if (fp==NULL) return(MES_ERROR);
        strcpy(aaa,""); strcpy(bbb,"");
        while (fgets(aaa, sizeof aaa, fp)!=NULL) {
                while (isspace(name[0])) strcpy(name, &name[1]);
@@ -91,22 +91,22 @@ int alias(char *name)               /* process alias and routing info for mail */
        lprintf(7, "Mail is being forwarded to %s\n", name);
 
        /* determine local or remote type, see citadel.h */
-       for (a=0; a<strlen(name); ++a) if (name[a]=='!') return(M_INTERNET);
+       for (a=0; a<strlen(name); ++a) if (name[a]=='!') return(MES_INTERNET);
        for (a=0; a<strlen(name); ++a)
                if (name[a]=='@')
                        for (b=a; b<strlen(name); ++b)
-                               if (name[b]=='.') return(M_INTERNET);
+                               if (name[b]=='.') return(MES_INTERNET);
        b=0; for (a=0; a<strlen(name); ++a) if (name[a]=='@') ++b;
        if (b>1) {
                lprintf(7, "Too many @'s in address\n");
-               return(M_ERROR);
+               return(MES_ERROR);
                }
        if (b==1) {
                for (a=0; a<strlen(name); ++a)
                        if (name[a]=='@') strcpy(bbb,&name[a+1]);
                while (bbb[0]==32) strcpy(bbb,&bbb[1]);
                fp = fopen("network/mail.sysinfo","r");
-               if (fp==NULL) return(M_ERROR);
+               if (fp==NULL) return(MES_ERROR);
 GETSN:         do {
                        a=getstring(fp,aaa);
                        } while ((a>=0)&&(strcasecmp(aaa,bbb)));
@@ -125,7 +125,7 @@ GETSN:              do {
                                }
                        while(bbb[strlen(bbb)-1]=='_') bbb[strlen(bbb)-1]=0;
                        sprintf(name,&aaa[4],bbb);
-                       return(M_INTERNET);
+                       return(MES_INTERNET);
                        }
                if (!strncmp(aaa,"bin",3)) {
                        strcpy(aaa,name); strcpy(bbb,name);
@@ -136,11 +136,11 @@ GETSN:            do {
                        strcpy(bbb,&bbb[1]);
                        while (bbb[0]==' ') strcpy(bbb,&bbb[1]);
                        sprintf(name,"%s @%s",aaa,bbb);
-                       return(M_BINARY);
+                       return(MES_BINARY);
                        }
-               return(M_ERROR);
+               return(MES_ERROR);
                }
-       return(M_LOCAL);
+       return(MES_LOCAL);
        }
 
 
@@ -924,7 +924,7 @@ void save_message(char *mtmp,       /* file containing proper message */
        lprintf(9, "mailbox aliasing loop\n");
        if (strlen(recipient) > 0) {
                /* mailtype = alias(recipient); */
-               if (mailtype == M_LOCAL) {
+               if (mailtype == MES_LOCAL) {
                        if (getuser(&userbuf, recipient)!=0) {
                                /* User not found, goto Aide */
                                strcpy(force_room, AIDEROOM);
@@ -963,7 +963,7 @@ void save_message(char *mtmp,       /* file containing proper message */
        lputroom(&CC->quickroom, actual_rm);
 
        /* Network mail - send a copy to the network program. */
-       if ( (strlen(recipient)>0) && (mailtype != M_LOCAL) ) {
+       if ( (strlen(recipient)>0) && (mailtype != MES_LOCAL) ) {
                sprintf(aaa,"./network/spoolin/netmail.%04lx.%04x.%04x",
                        (long)getpid(), CC->cs_pid, ++seqnum);
                copy_file(mtmp,aaa);
@@ -1001,7 +1001,7 @@ void aide_message(char *text)
        fprintf(fp,"N%s%c",NODENAME,0);
        fprintf(fp,"M%s\n%c",text,0);
        fclose(fp);
-       save_message(CC->temp,"",AIDEROOM,M_LOCAL,1);
+       save_message(CC->temp,"",AIDEROOM,MES_LOCAL,1);
        syslog(LOG_NOTICE,text);
        }
 
@@ -1030,8 +1030,8 @@ void make_message(
        strcpy(dest_node, "");
 
 
-       /* If net_type is M_BINARY, split out the destination node. */
-       if (net_type == M_BINARY) {
+       /* If net_type is MES_BINARY, split out the destination node. */
+       if (net_type == MES_BINARY) {
                strcpy(dest_node,NODENAME);
                for (a=0; a<strlen(recipient); ++a) {
                        if (recipient[a]=='@') {
@@ -1041,8 +1041,8 @@ void make_message(
                        }
                }
 
-       /* if net_type is M_INTERNET, set the dest node to 'internet' */
-       if (net_type == M_INTERNET) {
+       /* if net_type is MES_INTERNET, set the dest node to 'internet' */
+       if (net_type == MES_INTERNET) {
                strcpy(dest_node,"internet");
                }
 
@@ -1162,17 +1162,17 @@ void cmd_ent0(char *entargs)
                lprintf(9, "calling alias()\n");
                e=alias(buf);                   /* alias and mail type */
                lprintf(9, "alias() returned %d\n", e);
-               if ((buf[0]==0) || (e==M_ERROR)) {
+               if ((buf[0]==0) || (e==MES_ERROR)) {
                        cprintf("%d Unknown address - cannot send message.\n",
                                ERROR+NO_SUCH_USER);
                        return;
                        }
-               if ((e!=M_LOCAL)&&(CC->usersupp.axlevel<4)) {
+               if ((e!=MES_LOCAL)&&(CC->usersupp.axlevel<4)) {
                        cprintf("%d Net privileges required for network mail.\n",
                                ERROR+HIGHER_ACCESS_REQUIRED);
                        return;
                        }
-               if ((RESTRICT_INTERNET==1)&&(e==M_INTERNET)
+               if ((RESTRICT_INTERNET==1)&&(e==MES_INTERNET)
                   &&((CC->usersupp.flags&US_INTERNET)==0)
                   &&(!CC->internal_pgm) ) {
                        cprintf("%d You don't have access to Internet mail.\n",
@@ -1183,7 +1183,7 @@ void cmd_ent0(char *entargs)
                        mtsflag=1;
                        goto SKFALL;
                        }
-               if (e!=M_LOCAL) goto SKFALL;    /* don't search local file  */
+               if (e!=MES_LOCAL) goto SKFALL;  /* don't search local file  */
                if (!strcasecmp(buf,CC->usersupp.fullname)) {
                        cprintf("%d Can't send mail to yourself!\n",
                                ERROR+NO_SUCH_USER);
@@ -1262,12 +1262,12 @@ void cmd_ent3(char *entargs)
        /* If we're in Mail, check the recipient */
        if (strlen(recp) > 0) {
                e=alias(recp);                  /* alias and mail type */
-               if ((recp[0]==0) || (e==M_ERROR)) {
+               if ((recp[0]==0) || (e==MES_ERROR)) {
                        cprintf("%d Unknown address - cannot send message.\n",
                                ERROR+NO_SUCH_USER);
                        return;
                        }
-               if (e == M_LOCAL) {
+               if (e == MES_LOCAL) {
                        a = getuser(&tempUS,recp);
                        if (a!=0) {
                                cprintf("%d No such user.\n",

diff --git a/citadel/netproc.c b/citadel/netproc.c
index 59c2ebcd7063294b8e00bbe35b1b587a0bfa0863..7a137c222358ff80c808235d663b009948930571 100644 (file)
--- a/citadel/netproc.c
+++ b/citadel/netproc.c
@@ -408,10 +408,10 @@ GETSN:    for (stemp=slist; stemp!=NULL; stemp=stemp->next) {
                        goto GETSN;
                        }
                if (!strcasecmp(stemp->s_type,"bin")) {
-                       return(M_BINARY);
+                       return(MES_BINARY);
                        }
                if (!strcasecmp(stemp->s_type,"uum")) {
-                       return(M_INTERNET);
+                       return(MES_INTERNET);
                        }
                }
            }
@@ -788,7 +788,7 @@ NXMSG:      /* Seek to the beginning of the next message */
                a = get_sysinfo_type(minfo.D);
                syslog(LOG_NOTICE, "routing message to system <%s>", minfo.D);
                fflush(stdout);
-               if (a==M_INTERNET) {
+               if (a==MES_INTERNET) {
                        if (fork()==0) {
                                syslog(LOG_NOTICE, "netmailer %s", tname);
                                fflush(stdout);
@@ -800,7 +800,7 @@ NXMSG:      /* Seek to the beginning of the next message */
                                }
                        else while (wait(&b)!=(-1));
                        }
-               else if (a==M_BINARY) {
+               else if (a==MES_BINARY) {
                        ship_to(tname,minfo.D);
                        }
                else {

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 6122062d9cc35c7f363ec283c64d3ea2fb2602ed..27c6449386f32c9c5f4f8fbf19a768c316005341 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -522,7 +522,7 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                fprintf(fp, "N%s%c", NODENAME, 0);
                fprintf(fp, "M%s\n%c", x_msg, 0);
                fclose(fp);
-               save_message(CC->temp, "", config.c_logpages, M_LOCAL, 1);
+               save_message(CC->temp, "", config.c_logpages, MES_LOCAL, 1);
                unlink(CC->temp);
        }
        return (message_sent);