]> code.citadel.org Git - citadel.git/blobdiff - citadel/routines2.c
fix all the <time.h> vs. <sys/time.h> issues, hopefully
[citadel.git] / citadel / routines2.c
index 01364065c300e33b27796cd6cda40f4ccc4725f0..0211449415c69fe7105cf24943222a57a219c678 100644 (file)
@@ -1,8 +1,11 @@
-/* More Citadel/UX routines...
- * unlike routines.c, some of these DO use global variables.
- * $Id$
+/* $Id$
+ *
+ * More client-side support functions.
+ * Unlike routines.c, some of these DO use global variables.
+ *
  */
 
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <signal.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <errno.h>
+#include <stdarg.h>
 #include "citadel.h"
 #include "routines2.h"
 #include "routines.h"
 #include "commands.h"
 #include "tools.h"
+#include "messages.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
 
 void interr(int errnum);
 void strprompt(char *prompt, char *str, int len);
 void newprompt(char *prompt, char *str, int len);
 void sttybbs(int cmd);
 int inkey(void);
-int ka_wait(pid_t *kstatus);
 void serv_write(char *buf, int nbytes);
-void extract(char *dest, char *source, int parmnum);
 int haschar(char *st, int ch);
 void progress(long int curr, long int cmax);
-void citedit(FILE *fp, long int base_pos);
 int yesno(void);
 
 extern char temp[];
@@ -47,78 +63,92 @@ extern int screenwidth;
 int eopen(char *name, int mode)
 {
        int ret;
-       ret = open(name,mode);
-       if (ret<0) {
-               fprintf(stderr,"Cannot open file '%s', mode=%d, errno=%d\n",
-                       name,mode,errno);
+       ret = open(name, mode);
+       if (ret < 0) {
+               fprintf(stderr, "Cannot open file '%s', mode=%d, errno=%d\n",
+                       name, mode, errno);
                interr(errno);
-               }
-       return(ret);
        }
+       return (ret);
+}
 
 
-int room_prompt(int qrflags)   /* return proper room prompt character */
-             {
+int room_prompt(int qrflags)
+{                              /* return proper room prompt character */
        int a;
-       a='>';
-       if (qrflags&QR_DIRECTORY) a=']';
-       if ((a==']')&&(qrflags&QR_NETWORK)) a='}';
-       if ((a=='>')&&(qrflags&QR_NETWORK)) a=')';
-       return(a);
-       }
-
-void entregis(void)    /* register with name and address */
-       {
-
-       char buf[256];
-       char tmpname[256];
-       char tmpaddr[256];
-       char tmpcity[256];
-       char tmpstate[256];
-       char tmpzip[256];
-       char tmpphone[256];
-       char tmpemail[256];
+       a = '>';
+       if (qrflags & QR_DIRECTORY)
+               a = ']';
+       if ((a == ']') && (qrflags & QR_NETWORK))
+               a = '}';
+       if ((a == '>') && (qrflags & QR_NETWORK))
+               a = ')';
+       return (a);
+}
+
+void entregis(void)
+{                              /* register with name and address */
+
+       char buf[SIZ];
+       char tmpname[SIZ];
+       char tmpaddr[SIZ];
+       char tmpcity[SIZ];
+       char tmpstate[SIZ];
+       char tmpzip[SIZ];
+       char tmpphone[SIZ];
+       char tmpemail[SIZ];
+       char tmpcountry[SIZ];
        int a;
 
-       strcpy(tmpname,"");
-       strcpy(tmpaddr,"");
-       strcpy(tmpcity,"");
-       strcpy(tmpstate,"");
-       strcpy(tmpzip,"");
-       strcpy(tmpphone,"");
-       strcpy(tmpemail,"");
+       strcpy(tmpname, "");
+       strcpy(tmpaddr, "");
+       strcpy(tmpcity, "");
+       strcpy(tmpstate, "");
+       strcpy(tmpzip, "");
+       strcpy(tmpphone, "");
+       strcpy(tmpemail, "");
+       strcpy(tmpcountry, "");
 
        serv_puts("GREG _SELF_");
        serv_gets(buf);
-       if (buf[0]=='1') {
+       if (buf[0] == '1') {
                a = 0;
-               while (serv_gets(buf), strcmp(buf,"000")) {
-                       if (a==2) strcpy(tmpname,buf);
-                       if (a==3) strcpy(tmpaddr,buf);
-                       if (a==4) strcpy(tmpcity,buf);
-                       if (a==5) strcpy(tmpstate,buf);
-                       if (a==6) strcpy(tmpzip,buf);
-                       if (a==7) strcpy(tmpphone,buf);
-                       if (a==9) strcpy(tmpemail,buf);
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       if (a == 2)
+                               strcpy(tmpname, buf);
+                       if (a == 3)
+                               strcpy(tmpaddr, buf);
+                       if (a == 4)
+                               strcpy(tmpcity, buf);
+                       if (a == 5)
+                               strcpy(tmpstate, buf);
+                       if (a == 6)
+                               strcpy(tmpzip, buf);
+                       if (a == 7)
+                               strcpy(tmpphone, buf);
+                       if (a == 9)
+                               strcpy(tmpemail, buf);
+                       if (a == 10)
+                               strcpy(tmpcountry, buf);
                        ++a;
-                       }
                }
-
-       strprompt("REAL name",tmpname,29);
-       strprompt("Address",tmpaddr,24);
-       strprompt("City/town",tmpcity,14);
-       strprompt("State",tmpstate,2);
-       strprompt("ZIP Code",tmpzip,10);
-       strprompt("Telephone number",tmpphone,14);
-       strprompt("Email address",tmpemail,31);
+       }
+       strprompt("REAL name", tmpname, 29);
+       strprompt("Address", tmpaddr, 24);
+       strprompt("City/town", tmpcity, 14);
+       strprompt("State/province", tmpstate, 2);
+       strprompt("ZIP/Postal Code", tmpzip, 10);
+       strprompt("Country", tmpcountry, 31);
+       strprompt("Telephone number", tmpphone, 14);
+       strprompt("Email address", tmpemail, 31);
 
        /* now send the registration info back to the server */
        serv_puts("REGI");
        serv_gets(buf);
-       if (buf[0]!='4') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '4') {
+               printf("%s\n", &buf[4]);
                return;
-               }
+       }
        serv_puts(tmpname);
        serv_puts(tmpaddr);
        serv_puts(tmpcity);
@@ -126,119 +156,131 @@ void entregis(void)     /* register with name and address */
        serv_puts(tmpzip);
        serv_puts(tmpphone);
        serv_puts(tmpemail);
+       serv_puts(tmpcountry);
        serv_puts("000");
        printf("\n");
-       }
+}
 
-void updatels(void) {  /* make all messages old in current room */
-       char buf[256];
+void updatels(void)
+{                              /* make all messages old in current room */
+       char buf[SIZ];
        serv_puts("SLRP HIGHEST");
        serv_gets(buf);
-       if (buf[0]!='2') printf("%s\n",&buf[4]);
-       }
+       if (buf[0] != '2')
+               printf("%s\n", &buf[4]);
+}
 
-void updatelsa(void) {   /* only make messages old in this room that have been read */
-       char buf[256];
-       sprintf(buf,"SLRP %ld",highest_msg_read);
+/*
+ * only make messages old in this room that have been read
+ */
+void updatelsa(void)
+{
+       char buf[SIZ];
+       sprintf(buf, "SLRP %ld", highest_msg_read);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]!='2') printf("%s\n",&buf[4]);
-       }
+       if (buf[0] != '2')
+               printf("%s\n", &buf[4]);
+}
 
 
 /*
  * This routine completes a client upload
  */
-void do_upload(int fd) {
-       char buf[256];
+void do_upload(int fd)
+{
+       char buf[SIZ];
        char tbuf[4096];
        long transmitted_bytes, total_bytes;
        int bytes_to_send;
        int bytes_expected;
 
        /* learn the size of the file */
-       total_bytes = lseek(fd,0L,2);
-       lseek(fd,0L,0);
+       total_bytes = lseek(fd, 0L, 2);
+       lseek(fd, 0L, 0);
 
        transmitted_bytes = 0L;
-       progress(transmitted_bytes,total_bytes);
+       progress(transmitted_bytes, total_bytes);
        do {
-               bytes_to_send = read(fd,tbuf,4096);
-               if (bytes_to_send>0) {
-                       sprintf(buf,"WRIT %d",bytes_to_send);
+               bytes_to_send = read(fd, tbuf, 4096);
+               if (bytes_to_send > 0) {
+                       sprintf(buf, "WRIT %d", bytes_to_send);
                        serv_puts(buf);
                        serv_gets(buf);
-                       if (buf[0]=='7') {
+                       if (buf[0] == '7') {
                                bytes_expected = atoi(&buf[4]);
-                               serv_write(tbuf,bytes_expected);
-                               }
-                       else {
-                               printf("%s\n",&buf[4]);
-                               }
+                               serv_write(tbuf, bytes_expected);
+                       } else {
+                               printf("%s\n", &buf[4]);
                        }
-               transmitted_bytes = transmitted_bytes + (long)bytes_to_send;
+               }
+               transmitted_bytes = transmitted_bytes + (long) bytes_to_send;
                progress(transmitted_bytes, total_bytes);
-               } while (bytes_to_send > 0);
+       } while (bytes_to_send > 0);
 
        /* close the upload file, locally and at the server */
        close(fd);
        serv_puts("UCLS 1");
        serv_gets(buf);
-       printf("%s\n",&buf[4]);
-       }
+       printf("%s\n", &buf[4]);
+}
 
 
 /*
  * client-based uploads (for users with their own clientware)
  */
-void cli_upload(void) {
-       char flnm[256];
+void cli_upload(void)
+{
+       char flnm[SIZ];
        char desc[151];
-       char buf[256];
-       char tbuf[256];
+       char buf[SIZ];
+       char tbuf[SIZ];
        int a;
        int fd;
 
        if ((room_flags & QR_UPLOAD) == 0) {
                printf("*** You cannot upload to this room.\n");
                return;
-               }
-
-       newprompt("File to be uploaded: ",flnm,55);
-       fd = open(flnm,O_RDONLY);
-       if (fd<0) {
-               printf("Cannot open '%s': %s\n",flnm,strerror(errno));
+       }
+       newprompt("File to be uploaded: ", flnm, 55);
+       fd = open(flnm, O_RDONLY);
+       if (fd < 0) {
+               printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
-               }
+       }
        printf("Enter a description of this file:\n");
-       newprompt(": ",desc,75);
+       newprompt(": ", desc, 75);
 
        /* keep generating filenames in hope of finding a unique one */
        a = 0;
        do {
-               if (a==10) return; /* fail if tried 10 times */
-               strcpy(buf,flnm);
-               while ((strlen(buf)>0)&&(haschar(buf,'/')))
-                       strcpy(buf,&buf[1]);
-               if (a>0) sprintf(&buf[strlen(buf)],"%d",a);
-               sprintf(tbuf,"UOPN %s|%s",buf,desc);
+               if (a == 10)
+                       return; /* fail if tried 10 times */
+               strcpy(buf, flnm);
+               while ((strlen(buf) > 0) && (haschar(buf, '/')))
+                       strcpy(buf, &buf[1]);
+               if (a > 0)
+                       sprintf(&buf[strlen(buf)], "%d", a);
+               sprintf(tbuf, "UOPN %s|%s", buf, desc);
                serv_puts(tbuf);
                serv_gets(buf);
-               if (buf[0]!='2') printf("%s\n",&buf[4]);
+               if (buf[0] != '2')
+                       printf("%s\n", &buf[4]);
                ++a;
-               } while (buf[0]!='2');
+       } while (buf[0] != '2');
 
        /* at this point we have an open upload file at the server */
        do_upload(fd);
-       }
+}
 
 
 /*
  * Function used for various image upload commands
  */
-void cli_image_upload(char *keyname) {
-       char flnm[256];
-       char buf[256];
+void cli_image_upload(char *keyname)
+{
+       char flnm[SIZ];
+       char buf[SIZ];
        int fd;
 
        sprintf(buf, "UIMG 0|%s", keyname);
@@ -247,342 +289,369 @@ void cli_image_upload(char *keyname) {
        if (buf[0] != '2') {
                printf("%s\n", &buf[4]);
                return;
-               }
-
-       newprompt("Image file to be uploaded: ",flnm,55);
-       fd = open(flnm,O_RDONLY);
-       if (fd<0) {
-               printf("Cannot open '%s': %s\n",flnm,strerror(errno));
+       }
+       newprompt("Image file to be uploaded: ", flnm, 55);
+       fd = open(flnm, O_RDONLY);
+       if (fd < 0) {
+               printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
-               }
-
+       }
        sprintf(buf, "UIMG 1|%s", keyname);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
                printf("%s\n", &buf[4]);
                return;
-               }
-
-       do_upload(fd);
        }
+       do_upload(fd);
+}
 
 
 /*
  * protocol-based uploads (Xmodem, Ymodem, Zmodem)
  */
-void upload(int c)     /* c = upload mode */
-       {
-       char flnm[256];
+void upload(int c)
+{                              /* c = upload mode */
+       char flnm[SIZ];
        char desc[151];
-       char buf[256];
+       char buf[SIZ];
        char tbuf[4096];
        int xfer_pid;
-       int a,b;
-       FILE *fp,*lsfp;
+       int a, b;
+       FILE *fp, *lsfp;
        int fd;
 
        if ((room_flags & QR_UPLOAD) == 0) {
                printf("*** You cannot upload to this room.\n");
                return;
-               }
-
+       }
        /* we don't need a filename when receiving batch y/z modem */
-       if ((c==2)||(c==3)) strcpy(flnm,"x");
-       else newprompt("Enter filename: ",flnm,15);
+       if ((c == 2) || (c == 3))
+               strcpy(flnm, "x");
+       else
+               newprompt("Enter filename: ", flnm, 15);
 
-       for (a=0; a<strlen(flnm); ++a)
-               if ( (flnm[a]=='/') || (flnm[a]=='\\') || (flnm[a]=='>')
-                    || (flnm[a]=='?') || (flnm[a]=='*')
-                    || (flnm[a]==';') || (flnm[a]=='&') ) flnm[a]='_';
+       for (a = 0; a < strlen(flnm); ++a)
+               if ((flnm[a] == '/') || (flnm[a] == '\\') || (flnm[a] == '>')
+                   || (flnm[a] == '?') || (flnm[a] == '*')
+                   || (flnm[a] == ';') || (flnm[a] == '&'))
+                       flnm[a] = '_';
 
-       newprompt("Enter a short description of the file:\n: ",desc,150);
+       newprompt("Enter a short description of the file:\n: ", desc, 150);
 
        /* create a temporary directory... */
-       if (mkdir(tempdir,0700) != 0) {
+       if (mkdir(tempdir, 0700) != 0) {
                printf("*** Could not create temporary directory %s: %s\n",
-                       tempdir,strerror(errno));
+                      tempdir, strerror(errno));
                return;
-               }
-
+       }
        /* now do the transfer ... in a separate process */
        xfer_pid = fork();
        if (xfer_pid == 0) {
-           chdir(tempdir);
-           switch(c) {
-               case 0:
+               chdir(tempdir);
+               switch (c) {
+               case 0:
                        sttybbs(0);
-                       printf("Receiving %s - press Ctrl-D to end.\n",flnm);
-                       fp = fopen(flnm,"w");
+                       printf("Receiving %s - press Ctrl-D to end.\n", flnm);
+                       fp = fopen(flnm, "w");
                        do {
-                               b=inkey(); 
-                               if (b==13) {
-                                       b=10; printf("\r");
-                                       }
-                               if (b!=4) {
-                                       printf("%c",b);
-                                       putc(b,fp);
-                                       }
-                               } while(b!=4);
+                               b = inkey();
+                               if (b == 13) {
+                                       b = 10;
+                                       printf("\r");
+                               }
+                               if (b != 4) {
+                                       printf("%c", b);
+                                       putc(b, fp);
+                               }
+                       } while (b != 4);
                        fclose(fp);
                        exit(0);
-               case 1:
+               case 1:
                        sttybbs(3);
-                       execlp("rx","rx",flnm,NULL);
+                       execlp("rx", "rx", flnm, NULL);
                        exit(1);
-               case 2:
+               case 2:
                        sttybbs(3);
-                       execlp("rb","rb",NULL);
+                       execlp("rb", "rb", NULL);
                        exit(1);
-               case 3:
+               case 3:
                        sttybbs(3);
-                       execlp("rz","rz",NULL);
+                       execlp("rz", "rz", NULL);
                        exit(1);
-                       }
                }
-       else do {
-               b=ka_wait(&a);
-               } while ((b!=xfer_pid)&&(b!=(-1)));
+       } else
+               do {
+                       b = ka_wait(&a);
+               } while ((b != xfer_pid) && (b != (-1)));
        sttybbs(0);
 
        if (a != 0) {
                printf("\r*** Transfer unsuccessful.\n");
                nukedir(tempdir);
                return;
-               }
-
+       }
        printf("\r*** Transfer successful.  Sending file(s) to server...\n");
-       sprintf(buf,"cd %s; ls",tempdir);
-       lsfp = popen(buf,"r");
-       if (lsfp!=NULL) {
-               while (fgets(flnm,256,lsfp)!=NULL) {
-                       flnm[strlen(flnm)-1] = 0;
-                       sprintf(buf,"%s/%s",tempdir,flnm);
-                       fd = open(buf,O_RDONLY);
-                       if (fd>=0) {
+       sprintf(buf, "cd %s; ls", tempdir);
+       lsfp = popen(buf, "r");
+       if (lsfp != NULL) {
+               while (fgets(flnm, sizeof flnm, lsfp) != NULL) {
+                       flnm[strlen(flnm) - 1] = 0;
+                       sprintf(buf, "%s/%s", tempdir, flnm);
+                       fd = open(buf, O_RDONLY);
+                       if (fd >= 0) {
                                a = 0;
                                do {
-                                       sprintf(buf,"UOPN %s|%s",flnm,desc);
-                                       if (a>0) sprintf(&buf[strlen(buf)],
-                                               ".%d",a);
+                                       sprintf(buf, "UOPN %s|%s", flnm, desc);
+                                       if (a > 0)
+                                               sprintf(&buf[strlen(buf)],
+                                                       ".%d", a);
                                        ++a;
                                        serv_puts(buf);
                                        serv_gets(buf);
-                                       } while((buf[0]!='2')&&(a<100));
-                               if (buf[0]=='2') do {
-                                       a=read(fd,tbuf,4096);
-                                       if (a>0) {
-                                               sprintf(buf,"WRIT %d",a);
-                                               serv_puts(buf);
-                                               serv_gets(buf);
-                                               if (buf[0]=='7')
-                                                       serv_write(tbuf,a);
+                               } while ((buf[0] != '2') && (a < 100));
+                               if (buf[0] == '2')
+                                       do {
+                                               a = read(fd, tbuf, 4096);
+                                               if (a > 0) {
+                                                       sprintf(buf, "WRIT %d", a);
+                                                       serv_puts(buf);
+                                                       serv_gets(buf);
+                                                       if (buf[0] == '7')
+                                                               serv_write(tbuf, a);
                                                }
-                                       } while (a>0);
+                                       } while (a > 0);
                                close(fd);
                                serv_puts("UCLS 1");
                                serv_gets(buf);
-                               printf("%s\n",&buf[4]);
-                               }
+                               printf("%s\n", &buf[4]);
                        }
-               pclose(lsfp);
                }
-
-       nukedir(tempdir);
+               pclose(lsfp);
        }
+       nukedir(tempdir);
+}
 
 /* 
  * validate a user
  */
-void val_user(char *user)
+void val_user(char *user, int do_validate)
 {
        int a;
-       char cmd[256];
-       char buf[256];
+       char cmd[SIZ];
+       char buf[SIZ];
        int ax = 0;
 
-       sprintf(cmd,"GREG %s",user);
+       sprintf(cmd, "GREG %s", user);
        serv_puts(cmd);
        serv_gets(cmd);
-       if (cmd[0]=='1') {
+       if (cmd[0] == '1') {
                a = 0;
                do {
                        serv_gets(buf);
                        ++a;
-                       if (a==1) printf("User #%s - %s  ",
-                               buf,&cmd[4]);
-                       if (a==2) printf("PW: %s\n",buf);
-                       if (a==3) printf("%s\n",buf);
-                       if (a==4) printf("%s\n",buf);
-                       if (a==5) printf("%s, ",buf);
-                       if (a==6) printf("%s ",buf);
-                       if (a==7) printf("%s\n",buf);
-                       if (a==8) printf("%s\n",buf);
-                       if (a==9) ax=atoi(buf);
-                       if (a==10) printf("%s\n",buf);
-                       } while(strcmp(buf,"000"));
-               printf("Current access level: %d (%s)\n",ax,axdefs[ax]);
-               }
-       else {
-               printf("%-30s\n%s\n",user,&cmd[4]);
-               }
+                       if (a == 1)
+                               printf("User #%s - %s  ", buf, &cmd[4]);
+                       if (a == 2)
+                               printf("PW: %s\n", buf);
+                       if (a == 3)
+                               printf("%s\n", buf);
+                       if (a == 4)
+                               printf("%s\n", buf);
+                       if (a == 5)
+                               printf("%s, ", buf);
+                       if (a == 6)
+                               printf("%s ", buf);
+                       if (a == 7)
+                               printf("%s\n", buf);
+                       if (a == 8)
+                               printf("%s\n", buf);
+                       if (a == 9)
+                               ax = atoi(buf);
+                       if (a == 10)
+                               printf("%s\n", buf);
+                       if (a == 11)
+                               printf("%s\n", buf);
+               } while (strcmp(buf, "000"));
+               printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
+       } else {
+               printf("%-30s\n%s\n", user, &cmd[4]);
+       }
 
-       /* now set the access level */
-       ax = intprompt("Access level", ax, 0, 6);
-       sprintf(cmd,"VALI %s|%d",user,ax);
-       serv_puts(cmd);
-       serv_gets(cmd);
-       if (cmd[0]!='2') printf("%s\n",&cmd[4]);
-       printf("\n");
+       if (do_validate) {
+               /* now set the access level */
+               ax = intprompt("Access level", ax, 0, 6);
+               sprintf(cmd, "VALI %s|%d", user, ax);
+               serv_puts(cmd);
+               serv_gets(cmd);
+               if (cmd[0] != '2')
+                       printf("%s\n", &cmd[4]);
        }
+       printf("\n");
+}
 
 
-void validate(void) {  /* validate new users */
-       char cmd[256];
-       char buf[256];
+void validate(void)
+{                              /* validate new users */
+       char cmd[SIZ];
+       char buf[SIZ];
        int finished = 0;
 
        do {
                serv_puts("GNUR");
                serv_gets(cmd);
-               if (cmd[0]!='3') finished = 1;
-               if (cmd[0]=='2') printf("%s\n",&cmd[4]);
-               if (cmd[0]=='3') {
-                       extract(buf,cmd,0);
-                       val_user(&buf[4]);
-                       }
-               } while(finished==0);
-       }
+               if (cmd[0] != '3')
+                       finished = 1;
+               if (cmd[0] == '2')
+                       printf("%s\n", &cmd[4]);
+               if (cmd[0] == '3') {
+                       extract(buf, cmd, 0);
+                       val_user(&buf[4], 1);
+               }
+       } while (finished == 0);
+}
 
-void subshell(void) {
-       int a,b;
-       a=fork();
-       if (a==0) {
+void subshell(void)
+{
+       int a, b;
+       a = fork();
+       if (a == 0) {
                sttybbs(SB_RESTORE);
-               signal(SIGINT,SIG_DFL);
-               signal(SIGQUIT,SIG_DFL);
-               execlp(getenv("SHELL"),getenv("SHELL"),NULL);
+               signal(SIGINT, SIG_DFL);
+               signal(SIGQUIT, SIG_DFL);
+               execlp(getenv("SHELL"), getenv("SHELL"), NULL);
                printf("Could not open a shell: %s\n", strerror(errno));
                exit(errno);
-               }
+       }
        do {
-               b=ka_wait(NULL);
-               } while ((a!=b)&&(a!=(-1)));
+               b = ka_wait(NULL);
+       } while ((a != b) && (a != (-1)));
        sttybbs(0);
-       }
+}
 
 /*
  * <.A>ide <F>ile <D>elete command
  */
-void deletefile(void) {
+void deletefile(void)
+{
        char filename[32];
-       char cmd[256];
+       char cmd[SIZ];
 
-       newprompt("Filename: ",filename,31);
-       if (strlen(filename)==0) return;
-       sprintf(cmd,"DELF %s",filename);
+       newprompt("Filename: ", filename, 31);
+       if (strlen(filename) == 0)
+               return;
+       sprintf(cmd, "DELF %s", filename);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
-       }
+       printf("%s\n", &cmd[4]);
+}
 
 /*
  * <.A>ide <F>ile <S>end command
  */
-void netsendfile(void) {
-       char filename[32],destsys[20],cmd[256];
+void netsendfile(void)
+{
+       char filename[32], destsys[20], cmd[SIZ];
 
-       newprompt("Filename: ",filename,31);
-       if (strlen(filename)==0) return;
-       newprompt("System to send to: ",destsys,19);
-       sprintf(cmd,"NETF %s|%s",filename,destsys);
+       newprompt("Filename: ", filename, 31);
+       if (strlen(filename) == 0)
+               return;
+       newprompt("System to send to: ", destsys, 19);
+       sprintf(cmd, "NETF %s|%s", filename, destsys);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
+       printf("%s\n", &cmd[4]);
        return;
-       }
+}
 
 /*
  * <.A>ide <F>ile <M>ove command
  */
-void movefile(void) {
+void movefile(void)
+{
        char filename[64];
        char newroom[ROOMNAMELEN];
-       char cmd[256];
+       char cmd[SIZ];
 
-       newprompt("Filename: ",filename,63);
-       if (strlen(filename)==0) return;
-       newprompt("Enter target room: ",newroom,ROOMNAMELEN-1);
+       newprompt("Filename: ", filename, 63);
+       if (strlen(filename) == 0)
+               return;
+       newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
 
-       sprintf(cmd,"MOVF %s|%s",filename,newroom);
+       sprintf(cmd, "MOVF %s|%s", filename, newroom);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
-       }
+       printf("%s\n", &cmd[4]);
+}
 
 
 /* 
  * list of users who have filled out a bio
  */
-void list_bio(void) {
-       char buf[256];
+void list_bio(void)
+{
+       char buf[SIZ];
        int pos = 1;
 
        serv_puts("LBIO");
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '1') {
+               pprintf("%s\n", &buf[4]);
                return;
-               }
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               if ((pos+strlen(buf)+5)>screenwidth) {
-                       printf("\n");
+       }
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               if ((pos + strlen(buf) + 5) > screenwidth) {
+                       pprintf("\n");
                        pos = 1;
-                       }
-               printf("%s, ",buf);
-               pos = pos + strlen(buf) + 2;
                }
-       printf("%c%c  \n\n",8,8);
+               pprintf("%s, ", buf);
+               pos = pos + strlen(buf) + 2;
        }
+       pprintf("%c%c  \n\n", 8, 8);
+}
 
 
 /*
  * read bio
  */
-void read_bio(void) {
-       char who[256];
-       char buf[256];
+void read_bio(void)
+{
+       char who[SIZ];
+       char buf[SIZ];
 
        do {
-               newprompt("Read bio for who ('?' for list) : ",who,25);
-               printf("\n");
-               if (!strcmp(who,"?")) list_bio();
-               } while(!strcmp(who,"?"));
-       sprintf(buf,"RBIO %s",who);
+               newprompt("Read bio for who ('?' for list) : ", who, 25);
+               pprintf("\n");
+               if (!strcmp(who, "?"))
+                       list_bio();
+       } while (!strcmp(who, "?"));
+       sprintf(buf, "RBIO %s", who);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '1') {
+               pprintf("%s\n", &buf[4]);
                return;
-               }
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               printf("%s\n",buf);
-               }
        }
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               pprintf("%s\n", buf);
+       }
+}
 
 
 /* 
  * General system configuration command
  */
-void do_system_configuration(void) {
-       char buf[256];
-       char sc[19][256];
+void do_system_configuration(void)
+{
+       char buf[SIZ];
+       char sc[28][SIZ];
        int expire_mode = 0;
        int expire_value = 0;
        int a;
+       int logpages = 0;
 
        /* Clear out the config buffers */
-       bzero(&sc[0][0], sizeof(sc));
+       memset(&sc[0][0], 0, sizeof(sc));
 
        /* Fetch the current config */
        serv_puts("CONF get");
@@ -590,68 +659,96 @@ void do_system_configuration(void) {
        if (buf[0] == '1') {
                a = 0;
                while (serv_gets(buf), strcmp(buf, "000")) {
-                       if (a<19) strcpy(&sc[a][0], buf);
+                       if (a < 28)
+                               strcpy(&sc[a][0], buf);
                        ++a;
-                       }
                }
-
+       }
        /* Fetch the expire policy (this will silently fail on old servers,
         * resulting in "default" policy)
         */
        serv_puts("GPEX site");
        serv_gets(buf);
-       if (buf[0]=='2') {
+       if (buf[0] == '2') {
                expire_mode = extract_int(&buf[4], 0);
                expire_value = extract_int(&buf[4], 1);
-               }
+       }
+
+
+       /* Identification parameters */
 
        strprompt("Node name", &sc[0][0], 15);
        strprompt("Fully qualified domain name", &sc[1][0], 63);
        strprompt("Human readable node name", &sc[2][0], 20);
        strprompt("Modem dialup number", &sc[3][0], 15);
+       strprompt("Geographic location of this system", &sc[12][0], 31);
+       strprompt("Name of system administrator", &sc[13][0], 25);
+       strprompt("Paginator prompt", &sc[10][0], 79);
+       /* strprompt("Default moderation filter for new users", &sc[25][0], 4); */
 
-       sprintf(&sc[4][0], "%d", (boolprompt(
-               "Automatically give room aide privs to a user who creates a private room",
-               atoi(&sc[4][0]))));
-
-       strprompt("Server connection idle timeout (in seconds)", &sc[5][0], 4);
-       strprompt("Initial access level for new users", &sc[6][0], 1);
+       /* Security parameters */
 
        sprintf(&sc[7][0], "%d", (boolprompt(
-               "Require registration for new users",
-               atoi(&sc[7][0]))));
+                                   "Require registration for new users",
+                                                   atoi(&sc[7][0]))));
+       strprompt("Initial access level for new users", &sc[6][0], 1);
+       strprompt("Access level required to create rooms", &sc[19][0], 1);
+       sprintf(&sc[4][0], "%d", (boolprompt(
+                                                   "Automatically give room aide privs to a user who creates a private room",
+                                                   atoi(&sc[4][0]))));
 
        sprintf(&sc[8][0], "%d", (boolprompt(
-               "Automatically move problem user messages to twit room",
-               atoi(&sc[8][0]))));
+                "Automatically move problem user messages to twit room",
+                                                   atoi(&sc[8][0]))));
 
        strprompt("Name of twit room", &sc[9][0], ROOMNAMELEN);
-       strprompt("Paginator prompt", &sc[10][0], 79);
-
        sprintf(&sc[11][0], "%d", (boolprompt(
-               "Restrict Internet mail to only those with that privilege",
-               atoi(&sc[11][0]))));
+             "Restrict Internet mail to only those with that privilege",
+                                                    atoi(&sc[11][0]))));
+       sprintf(&sc[26][0], "%d", (boolprompt(
+             "Allow Aides to Zap (forget) rooms",
+                                                    atoi(&sc[26][0]))));
+
+       if (strlen(&sc[18][0]) > 0) logpages = 1;
+       else logpages = 0;
+       logpages = boolprompt("Log all pages", logpages);
+       if (logpages) {
+               strprompt("Name of logging room", &sc[18][0], ROOMNAMELEN);
+       }
+       else {
+               sc[18][0] = 0;
+       }
 
-       strprompt("Geographic location of this system", &sc[12][0], 31);
-       strprompt("Name of system administrator", &sc[13][0], 25);
+
+       /* Server tuning */
+
+       strprompt("Server connection idle timeout (in seconds)", &sc[5][0], 4);
        strprompt("Maximum concurrent sessions", &sc[14][0], 4);
+       strprompt("Maximum message length", &sc[20][0], 20);
+       strprompt("Minimum number of worker threads", &sc[21][0], 3);
+       strprompt("Maximum number of worker threads", &sc[22][0], 3);
        strprompt("Server-to-server networking password", &sc[15][0], 19);
+       strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+       strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
+       strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
+
+
+       /* Expiry settings */
        strprompt("Default user purge time (days)", &sc[16][0], 5);
        strprompt("Default room purge time (days)", &sc[17][0], 5);
-       strprompt("Name of room to log pages", &sc[18][0], ROOMNAMELEN);
 
        /* Angels and demons dancing in my head... */
        do {
                sprintf(buf, "%d", expire_mode);
                strprompt("System default message expire policy (? for list)",
-                       buf, 1);
+                         buf, 1);
                if (buf[0] == '?') {
                        printf("\n");
                        printf("1. Never automatically expire messages\n");
                        printf("2. Expire by message count\n");
                        printf("3. Expire by message age\n");
-                       }
-               } while((buf[0]<49)||(buf[0]>51));
+               }
+       } while ((buf[0] < 49) || (buf[0] > 51));
        expire_mode = buf[0] - 48;
 
        /* ...lunatics and monsters underneath my bed */
@@ -659,27 +756,146 @@ void do_system_configuration(void) {
                sprintf(buf, "%d", expire_value);
                strprompt("Keep how many messages online?", buf, 10);
                expire_value = atol(buf);
-               }
-
+       }
        if (expire_mode == 3) {
                sprintf(buf, "%d", expire_value);
                strprompt("Keep messages for how many days?", buf, 10);
                expire_value = atol(buf);
-               }
-
+       }
        /* Save it */
        printf("Save this configuration? ");
        if (yesno()) {
                serv_puts("CONF set");
                serv_gets(buf);
                if (buf[0] == '4') {
-                       for (a=0; a<19; ++a) serv_puts(&sc[a][0]);
+                       for (a = 0; a < 28; ++a)
+                               serv_puts(&sc[a][0]);
                        serv_puts("000");
-                       }
-
+               }
                snprintf(buf, sizeof buf, "SPEX site|%d|%d",
-                       expire_mode, expire_value);
+                        expire_mode, expire_value);
                serv_puts(buf);
                serv_gets(buf);
+       }
+}
+
+
+/*
+ * support function for do_internet_configuration()
+ */
+void get_inet_rec_type(char *buf) {
+       int sel;
+
+       keyopt(" <1> localhost       (Alias for this computer)\n");
+       keyopt(" <2> gateway domain  (Domain for all Citadel systems)\n");
+       keyopt(" <3> smart-host      (Forward all outbound mail to this host)\n");
+       sel = intprompt("Which one", 1, 1, 3);
+       switch(sel) {
+               case 1: strcpy(buf, "localhost");
+                       return;
+               case 2: strcpy(buf, "gatewaydomain");
+                       return;
+               case 3: strcpy(buf, "smarthost");
+                       return;
+       }
+}
+
+
+/*
+ * Internet mail configuration
+ */
+void do_internet_configuration(void) {
+       char buf[SIZ];
+       int num_recs = 0;
+       char **recs = NULL;
+       char ch;
+       int badkey;
+       int i, j;
+       int quitting = 0;
+       
+
+       sprintf(buf, "CONF getsys|%s", INTERNETCFG);
+       serv_puts(buf);
+       serv_gets(buf);
+       if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+               ++num_recs;
+               if (num_recs == 1) recs = malloc(sizeof(char *));
+               else recs = realloc(recs, (sizeof(char *)) * num_recs);
+               recs[num_recs-1] = malloc(SIZ);
+               strcpy(recs[num_recs-1], buf);
+       }
+
+       do {
+               printf("\n");
+               color(BRIGHT_WHITE);
+               printf("### ");
+               printf("                   Host or domain                  ");
+               printf("   Record type      \n");
+               color(DIM_WHITE);
+               printf("--- ");
+               printf("-------------------------------------------------- ");
+               printf("--------------------\n");
+               for (i=0; i<num_recs; ++i) {
+               color(DIM_WHITE);
+               printf("%3d ", i+1);
+               extract(buf, recs[i], 0);
+               color(BRIGHT_CYAN);
+               printf("%-50s ", buf);
+               extract(buf, recs[i], 1);
+               color(BRIGHT_MAGENTA);
+               printf("%-20s\n", buf);
+               color(DIM_WHITE);
+               }
+
+               ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
+               switch(ch) {
+                       case 'a':
+                               ++num_recs;
+                               if (num_recs == 1)
+                                       recs = malloc(sizeof(char *));
+                               else recs = realloc(recs,
+                                       (sizeof(char *)) * num_recs);
+                               newprompt("Enter host name: ",
+                                       buf, 50);
+                               strcat(buf, "|");
+                               get_inet_rec_type(&buf[strlen(buf)]);
+                               recs[num_recs-1] = strdup(buf);
+                               break;
+                       case 'd':
+                               i = intprompt("Delete which one",
+                                       1, 1, num_recs) - 1;
+                               free(recs[i]);
+                               --num_recs;
+                               for (j=i; j<num_recs; ++j)
+                                       recs[j] = recs[j+1];
+                               break;
+                       case 's':
+                               sprintf(buf, "CONF putsys|%s",
+                                       INTERNETCFG);
+                               serv_puts(buf);
+                               serv_gets(buf);
+                               if (buf[0] == '4') {
+                                       for (i=0; i<num_recs; ++i) {
+                                               serv_puts(recs[i]);
+                                       }
+                                       serv_puts("000");
+                               }
+                               else {
+                                       printf("%s\n", &buf[4]);
+                               }
+                               quitting = 1;
+                               break;
+                       case 'q':
+                               quitting = boolprompt(
+                                       "Quit without saving", 0);
+                               break;
+                       default:
+                               badkey = 1;
                }
+       } while (quitting == 0);
+
+       if (recs != NULL) {
+               for (i=0; i<num_recs; ++i) free(recs[i]);
+               free(recs);
        }
+}