]> code.citadel.org Git - citadel.git/blobdiff - citadel/rooms.c
* The size constant "256" which shows up everywhere as a buffer size has now
[citadel.git] / citadel / rooms.c
index 18bdae67bb02a3b26221b76bf244bbea32adcb72..3e276edc2bd42010752dc3b134a4ce9bb4e06e51 100644 (file)
@@ -1,5 +1,10 @@
-/* Citadel/UX room-oriented routines */
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * 
+ * Client-side functions which perform room operations
+ *
+ */
 
 #include "sysdep.h"
 #include <stdlib.h>
@@ -18,6 +23,7 @@
 #include "rooms.h"
 #include "commands.h"
 #include "tools.h"
+#include "messages.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
@@ -30,18 +36,15 @@ void hit_any_key(void);
 int yesno(void);
 void strprompt(char *prompt, char *str, int len);
 void newprompt(char *prompt, char *str, int len);
-int struncmp(char *lstr, char *rstr, int len);
 void dotgoto(char *towhere, int display_name);
 void serv_read(char *buf, int bytes);
 void formout(char *name);
 int inkey(void);
 int fmout(int width, FILE *fp, char pagin, int height, int starting_lp, char subst);
-void citedit(FILE *fp, long int base_pos);
 void progress(long int curr, long int cmax);
 int pattern(char *search, char *patn);
 int file_checksum(char *filename);
 int nukedir(char *dirname);
-void color(int colornum);
 
 extern unsigned room_flags;
 extern char room_name[];
@@ -62,12 +65,12 @@ extern int ugnum;
 extern long uglsn;
 extern char ugname[];
 
-extern char floorlist[128][256];
+extern char floorlist[128][SIZ];
 
 
 void load_floorlist(void) {
        int a;
-       char buf[256];
+       char buf[SIZ];
 
        for (a=0; a<128; ++a) floorlist[a][0] = 0;
 
@@ -85,7 +88,7 @@ void load_floorlist(void) {
 
 void room_tree_list(struct roomlisting *rp) {
        static int c = 0;
-       char rmname[32];
+       char rmname[ROOMNAMELEN];
        int f;
 
        if (rp == NULL) {
@@ -101,23 +104,25 @@ void room_tree_list(struct roomlisting *rp) {
                strcpy(rmname, rp->rlname);
                f = rp->rlflags;
                if ((c + strlen(rmname) + 4) > screenwidth) {
-                       printf("\n");
+
+                       /* line break, check the paginator */
+                       pprintf("\n");
                        c = 1;
                        }
                        if (f & QR_MAILBOX) {
-                       color(6);
+                       color(BRIGHT_YELLOW);
                        }
                else if (f & QR_PRIVATE) {
-                       color(1);
+                       color(BRIGHT_RED);
                        }
                else {
-                       color(2);
+                       color(DIM_WHITE);
                        }
-               printf("%s",rmname);
-               if ((f & QR_DIRECTORY) && (f & QR_NETWORK)) printf("}  ");
-               else if (f & QR_DIRECTORY) printf("]  ");
-               else if (f & QR_NETWORK) printf(")  ");
-               else printf(">  ");
+               pprintf("%s",rmname);
+               if ((f & QR_DIRECTORY) && (f & QR_NETWORK)) pprintf("}  ");
+               else if (f & QR_DIRECTORY) pprintf("]  ");
+               else if (f & QR_NETWORK) pprintf(")  ");
+               else pprintf(">  ");
                c = c + strlen(rmname) + 3;
                }
 
@@ -150,7 +155,7 @@ int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
  */
 void listrms(char *variety)
 {
-       char buf[256];
+       char buf[SIZ];
 
        struct roomlisting *rl = NULL;
        struct roomlisting *rp;
@@ -196,13 +201,10 @@ void listrms(char *variety)
                        }
                }
 
-       sigcaught = 0;
-       sttybbs(SB_YES_INTR);
        room_tree_list(NULL);
        room_tree_list(rl);
-       color(7);
-       sttybbs(SB_NO_INTR);
-       }
+       color(DIM_WHITE);
+}
 
 
 void list_other_floors(void) {
@@ -211,10 +213,10 @@ void list_other_floors(void) {
        c = 1;
        for (a=0; a<128; ++a) if ((strlen(floorlist[a])>0)&&(a!=curr_floor)) {
                if ((c + strlen(floorlist[a]) + 4) > screenwidth) {
-                       printf("\n");
+                       pprintf("\n");
                        c = 1;
                        }
-               printf("%s:  ",floorlist[a]);
+               pprintf("%s:  ",floorlist[a]);
                c = c + strlen(floorlist[a]) + 3;
                }
        }
@@ -226,59 +228,59 @@ void list_other_floors(void) {
  */
 void knrooms(int kn_floor_mode)
 {
-       char buf[256];
+       char buf[SIZ];
        int a;
 
        load_floorlist();
 
        if (kn_floor_mode == 0) {
-               color(3);
-               printf("\n   Rooms with unread messages:\n");
+               color(BRIGHT_CYAN);
+               pprintf("\n   Rooms with unread messages:\n");
                listrms("LKRN");
-               color(3);
-               printf("\n\n   No unseen messages in:\n");
+               color(BRIGHT_CYAN);
+               pprintf("\n\n   No unseen messages in:\n");
                listrms("LKRO");
-               printf("\n");
+               pprintf("\n");
                }
 
        if (kn_floor_mode == 1) {
-               color(3);
-               printf("\n   Rooms with unread messages on %s:\n",
+               color(BRIGHT_CYAN);
+               pprintf("\n   Rooms with unread messages on %s:\n",
                        floorlist[(int)curr_floor]);
-               sprintf(buf,"LKRN %d",curr_floor);
+               sprintf(buf,"LKRN %d", curr_floor);
                listrms(buf);
-               color(3);
-               printf("\n\n   Rooms with no new messages on %s:\n",
+               color(BRIGHT_CYAN);
+               pprintf("\n\n   Rooms with no new messages on %s:\n",
                        floorlist[(int)curr_floor]);
                sprintf(buf,"LKRO %d",curr_floor);
                listrms(buf);
-               color(3);
-               printf("\n\n   Other floors:\n");
+               color(BRIGHT_CYAN);
+               pprintf("\n\n   Other floors:\n");
                list_other_floors();
-               printf("\n");
+               pprintf("\n");
                }
 
        if (kn_floor_mode == 2) {
                for (a=0; a<128; ++a) if (floorlist[a][0]!=0) {
-                       color(3);
-                       printf("\n   Rooms on %s:\n",floorlist[a]);
+                       color(BRIGHT_CYAN);
+                       pprintf("\n   Rooms on %s:\n",floorlist[a]);
                        sprintf(buf,"LKRA %d",a);
                        listrms(buf);
-                       printf("\n");
+                       pprintf("\n");
                        }
                }
        
-       color(7);
+       color(DIM_WHITE);
        IFNEXPERT hit_any_key();
        }
 
 
 void listzrooms(void) {                /* list public forgotten rooms */
-       color(3);
-       printf("\n   Forgotten public rooms:\n");
+       color(BRIGHT_CYAN);
+       pprintf("\n   Forgotten public rooms:\n");
        listrms("LZRM");
-       printf("\n");
-       color(7);
+       pprintf("\n");
+       color(DIM_WHITE);
        IFNEXPERT hit_any_key();
        }
 
@@ -303,7 +305,7 @@ int set_room_attr(int ibuf, char *prompt, unsigned int sbit)
 int select_floor(int rfloor)
 {
        int a, newfloor;
-       char floorstr[256];
+       char floorstr[SIZ];
 
        if (floor_mode == 1) {
                if (floorlist[(int)curr_floor][0]==0) load_floorlist();
@@ -311,11 +313,11 @@ int select_floor(int rfloor)
                do {
                        newfloor = (-1);
                        safestrncpy(floorstr,floorlist[rfloor],sizeof floorstr);
-                       strprompt("Which floor",floorstr,256);
+                       strprompt("Which floor",floorstr,SIZ);
                        for (a=0; a<128; ++a) {
-                               if (!strucmp(floorstr,&floorlist[a][0]))
+                               if (!strcasecmp(floorstr,&floorlist[a][0]))
                                        newfloor = a;
-                               if ((newfloor<0)&&(!struncmp(floorstr,
+                               if ((newfloor<0)&&(!strncasecmp(floorstr,
                                        &floorlist[a][0],strlen(floorstr))))
                                                newfloor = a;
                                if ((newfloor<0)&&(pattern(&floorlist[a][0],
@@ -347,7 +349,7 @@ void editthisroom(void) {
        unsigned rflags;
        int rbump;
        char raide[32];
-       char buf[256];
+       char buf[SIZ];
        int rfloor;
        int rorder;
        int expire_mode = 0;
@@ -440,7 +442,7 @@ void editthisroom(void) {
        /* Ask about the room aide */
        do {
                strprompt("Room aide (or 'none')",raide,29);
-               if (!strucmp(raide,"none")) {
+               if (!strcasecmp(raide,"none")) {
                        strcpy(raide,"");
                        strcpy(buf,"200");
                        }
@@ -452,7 +454,7 @@ void editthisroom(void) {
                        }
                } while(buf[0]!='2');
 
-       if (!strucmp(raide,"none")) strcpy(raide,"");
+       if (!strcasecmp(raide,"none")) strcpy(raide,"");
 
 
        /* Angels and demons dancing in my head... */
@@ -510,7 +512,7 @@ void editthisroom(void) {
  * un-goto the previous room
  */
 void ungoto(void) { 
-       char buf[256];
+       char buf[SIZ];
        
        if (!strcmp(ugname,"")) return;
        snprintf(buf,sizeof buf,"GOTO %s",ugname);
@@ -537,14 +539,14 @@ void ungoto(void) {
  */
 void download_to_local_disk(char *supplied_filename, long total_bytes)
 {
-       char buf[256];
+       char buf[SIZ];
        char dbuf[4096];
        long transmitted_bytes = 0L;
        long aa,bb;
        FILE *savefp;
        int broken = 0;
        int packet;
-       char filename[256];
+       char filename[SIZ];
 
        strcpy(filename, supplied_filename);
        if (strlen(filename)==0) {
@@ -554,7 +556,7 @@ void download_to_local_disk(char *supplied_filename, long total_bytes)
        printf("Enter the name of the directory to save '%s'\n",
                filename);
        printf("to, or press return for the current directory.\n");
-       newprompt("Directory: ",dbuf,256);
+       newprompt("Directory: ", dbuf, sizeof dbuf);
        if (strlen(dbuf)==0) strcpy(dbuf,".");
        strcat(dbuf,"/");
        strcat(dbuf,filename);
@@ -605,19 +607,17 @@ void download_to_local_disk(char *supplied_filename, long total_bytes)
  */
 void download(int proto)
 {
-       char buf[256];
-       char filename[256];
+       char buf[SIZ];
+       char filename[SIZ];
+       char tempname[SIZ];
+       char transmit_cmd[SIZ];
        long total_bytes = 0L;
-#ifdef HAVE_MKFIFO
        char dbuf[4096];
        long transmitted_bytes = 0L;
        long aa,bb;
-       int a,b;
        int packet;
        FILE *tpipe = NULL;
-       int proto_pid;
        int broken = 0;
-#endif
 
        if ((room_flags & QR_DOWNLOAD) == 0) {
                printf("*** You cannot download from this room.\n");
@@ -641,65 +641,13 @@ void download(int proto)
                return;
                }
 
-#ifdef HAVE_MKFIFO
        /* Meta-download for public clients */
-       mkdir(tempdir,0700);
-       snprintf(buf,sizeof buf,"%s/%s",tempdir,filename);
-       mkfifo(buf, 0777);
-
-       /* We do the remainder of this function as a separate process in
-        * order to allow recovery if the transfer is aborted.  If the
-        * file transfer program aborts, the first child process receives a
-        * "broken pipe" signal and aborts.  We *should* be able to catch
-        * this condition with signal(), but it doesn't seem to work on all
-        * systems.
-        */
-       a = fork();
-       if (a!=0) {
-               /* wait for the download to finish */
-               while (wait(&b)!=a) ;;
-               sttybbs(0);
-               /* close the download file at the server */
-               serv_puts("CLOS");
-               serv_gets(buf);
-               if (buf[0]!='2') {
-                       printf("%s\n",&buf[4]);
-                       }
-               /* clean up the temporary directory */
-               nukedir(tempdir);
-               return;
-               }
-
-       snprintf(buf,sizeof buf,"%s/%s",tempdir,filename); /* full pathname */
-
-       /* The next fork() creates a second child process that is used for
-        * the actual file transfer program (usually sz).
-        */
-       proto_pid = fork();
-       if (proto_pid == 0) {
-               if (proto==0)  {
-                       sttybbs(0);
-                       signal(SIGINT,SIG_DFL);
-                       signal(SIGQUIT,SIG_DFL);
-                       snprintf(dbuf,sizeof dbuf,"SHELL=/dev/null; export SHELL; TERM=dumb; export TERM; exec more -d <%s",buf);
-                       system(dbuf);
-                       sttybbs(SB_NO_INTR);
-                       exit(0);
-                       }
-               sttybbs(3);
-               signal(SIGINT,SIG_DFL);
-               signal(SIGQUIT,SIG_DFL);
-               if (proto==1) execlp("sx","sx",buf,NULL);
-               if (proto==2) execlp("cat","cat",buf,NULL);
-               if (proto==3) execlp("sb","sb",buf,NULL);
-               if (proto==4) execlp("sz","sz",buf,NULL);
-               execlp("cat","cat",buf,NULL);
-               exit(1);
-               }
-
-       tpipe = fopen(buf,"w");
-
+       printf("Fetching file from Citadel server...\n");
+       mkdir(tempdir, 0700);
+       snprintf(tempname, sizeof tempname, "%s/%s", tempdir, filename);
+       tpipe = fopen(tempname, "wb");
        while ( (transmitted_bytes < total_bytes) && (broken == 0) ) {
+               progress(transmitted_bytes, total_bytes);
                bb = total_bytes - transmitted_bytes;
                aa = ((bb < 4096) ? bb : 4096);
                sprintf(buf,"READ %ld|%ld",transmitted_bytes,aa);
@@ -707,53 +655,66 @@ void download(int proto)
                serv_gets(buf);
                if (buf[0]!='6') {
                        printf("%s\n",&buf[4]);
-                       return;
-                       }
+               }
                packet = extract_int(&buf[4],0);
                serv_read(dbuf,packet);
                if (fwrite(dbuf,packet,1,tpipe) < 1) broken = 1;
                transmitted_bytes = transmitted_bytes + (long)packet;
-               }
-       if (tpipe!=NULL) fclose(tpipe);
+       }
+       fclose(tpipe);
+       progress(transmitted_bytes, total_bytes);
 
-       /* Hang out and wait for the file transfer program to finish */
-       while (wait(&a) != proto_pid) ;;
+       /* close the download file at the server */
+       serv_puts("CLOS");
+       serv_gets(buf);
+       if (buf[0]!='2') {
+               printf("%s\n",&buf[4]);
+       }
 
+       if (proto==0)           sprintf(transmit_cmd, "SHELL=/dev/null; export SHELL; TERM=dumb; export TERM; exec more -d <%s",tempname);
+       else if (proto==1)      sprintf(transmit_cmd, "exec sx %s", tempname);
+       else if (proto==3)      sprintf(transmit_cmd, "exec sb %s", tempname);
+       else if (proto==4)      sprintf(transmit_cmd, "exec sz %s", tempname);
+       else                    sprintf(transmit_cmd, "exec cat %s", tempname);
 
+       sttybbs(SB_RESTORE);
+       system(transmit_cmd);
+       sttybbs(SB_NO_INTR);
+       
+       /* clean up the temporary directory */
+       nukedir(tempdir);
        putc(7,stdout);
-       exit(0);        /* transfer control back to the main program */
-#endif
-       }
+}
 
 
 /*
  * read directory of this room
  */
 void roomdir(void) {
-       char flnm[256];
+       char flnm[SIZ];
        char flsz[32];
-       char comment[256];
-       char buf[256];
+       char comment[SIZ];
+       char buf[SIZ];
 
        serv_puts("RDIR");
        serv_gets(buf);
        if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+               pprintf("%s\n",&buf[4]);
                return;
                }
 
        extract(comment,&buf[4],0);
        extract(flnm,&buf[4],1);
-       printf("\nDirectory of %s on %s\n",flnm,comment);
-       printf("-----------------------\n");
+       pprintf("\nDirectory of %s on %s\n",flnm,comment);
+       pprintf("-----------------------\n");
        while (serv_gets(buf), strcmp(buf,"000")) {
                extract(flnm,buf,0);
                extract(flsz,buf,1);
                extract(comment,buf,2);
                if (strlen(flnm)<=14)
-                       printf("%-14s %8s %s\n",flnm,flsz,comment);
+                       pprintf("%-14s %8s %s\n",flnm,flsz,comment);
                else
-                       printf("%s\n%14s %8s %s\n",flnm,"",flsz,comment);
+                       pprintf("%s\n%14s %8s %s\n",flnm,"",flsz,comment);
                }
        }
 
@@ -762,7 +723,7 @@ void roomdir(void) {
  * add a user to a private room
  */
 void invite(void) {
-       char aaa[31],bbb[256];
+       char aaa[31],bbb[SIZ];
 
        if ((room_flags & QR_PRIVATE)==0) {
                printf("This is not a private room.\n");
@@ -783,7 +744,7 @@ void invite(void) {
  * kick a user out of a room
  */
 void kickout(void) {
-       char aaa[31],bbb[256];
+       char aaa[31],bbb[SIZ];
 
        newprompt("Name of user? ",aaa,30);
        if (aaa[0]==0) return;
@@ -819,7 +780,7 @@ void killroom(void) {
        }
 
 void forget(void) {    /* forget the current room */
-       char cmd[256];
+       char cmd[SIZ];
 
        printf("Are you sure you want to forget this room? ");
        if (yesno()==0) return;
@@ -840,7 +801,7 @@ void forget(void) { /* forget the current room */
  * create a new room
  */
 void entroom(void) {
-       char cmd[256];
+       char cmd[SIZ];
        char new_room_name[ROOMNAMELEN];
        int new_room_type;
        char new_room_pass[10];
@@ -864,17 +825,18 @@ void entroom(void) {
 
        IFNEXPERT formout("roomaccess");
        do {
-               printf("<?>Help\n<1>Public room\n<2>Guess-name room\n");
-               printf("<3>Passworded room\n<4>Invitation-only room\n");
+               printf( "<?>Help\n<1>Public room\n<2>Guess-name room\n"
+                       "<3>Passworded room\n<4>Invitation-only room\n"
+                       "<5>Personal room\n");
                printf("Enter room type: ");
                do {
                        b=inkey();
-                       } while (((b<'1')||(b>'4')) && (b!='?'));
+                       } while (((b<'1')||(b>'5')) && (b!='?'));
                if (b=='?') {
                        printf("?\n");
                        formout("roomaccess");
                        }
-               } while ((b<'1')||(b>'4'));
+               } while ((b<'1')||(b>'5'));
        b=b-48;
        printf("%d\n",b);
        new_room_type = b - 1;
@@ -890,6 +852,7 @@ void entroom(void) {
        if (b==2) printf(" guess-name room.");
        if (b==3) printf(" passworded room, password: %s",new_room_pass);
        if (b==4) printf("n invitation-only room.");
+       if (b==5) printf(" personal room.");
        printf("\nInstall it? (y/n) : ");
        a=yesno();
        if (a==0) return;
@@ -910,7 +873,7 @@ void entroom(void) {
 
 
 void readinfo(void) {  /* read info file for current room */
-       char cmd[256];
+       char cmd[SIZ];
        
        sprintf(cmd,"RINF");
        serv_puts(cmd);
@@ -928,26 +891,23 @@ void readinfo(void) {     /* read info file for current room */
  * <W>ho knows room...
  */
 void whoknows(void) {
-       char buf[256];
+       char buf[SIZ];
        serv_puts("WHOK");
        serv_gets(buf);
        if (buf[0]!='1') {
-               printf("%s\n",&buf[5]);
+               pprintf("%s\n",&buf[5]);
                return;
-               }
-       sigcaught = 0;
-       sttybbs(SB_YES_INTR);
+       }
        while (serv_gets(buf), strncmp(buf,"000",3)) {
-               if (sigcaught==0) printf("%s\n",buf);
-               }
-       sttybbs(SB_NO_INTR);
+               if (sigcaught==0) pprintf("%s\n",buf);
        }
+}
 
 
 void do_edit(char *desc, char *read_cmd, char *check_cmd, char *write_cmd)
 {
        FILE *fp;
-       char cmd[256];
+       char cmd[SIZ];
        int b,cksum,editor_exit;
 
 
@@ -1000,7 +960,7 @@ void do_edit(char *desc, char *read_cmd, char *check_cmd, char *write_cmd)
                printf("Entering %s.  ",desc);
                printf("Press return twice when finished.\n");
                fp=fopen(temp,"r+");
-               citedit(fp,0);
+               citedit(fp);
                fclose(fp);
                }
 
@@ -1034,7 +994,7 @@ void enterinfo(void) {             /* edit info file for current room */
        }
 
 void enter_bio(void) {
-       char cmd[256];
+       char cmd[SIZ];
        snprintf(cmd,sizeof cmd,"RBIO %s",fullname);
        do_edit("your Bio",cmd,"NOOP","EBIO");
        }
@@ -1043,8 +1003,8 @@ void enter_bio(void) {
  * create a new floor
  */
 void create_floor(void) {
-       char buf[256];
-       char newfloorname[256];
+       char buf[SIZ];
+       char newfloorname[SIZ];
 
        serv_puts("CFLR xx|0");
        serv_gets(buf);
@@ -1069,7 +1029,7 @@ void create_floor(void) {
  * edit the current floor
  */
 void edit_floor(void) {
-       char buf[256];
+       char buf[SIZ];
        int expire_mode = 0;
        int expire_value = 0;
 
@@ -1138,7 +1098,7 @@ void edit_floor(void) {
  */
 void kill_floor(void) {
        int floornum_to_delete,a;
-       char buf[256];
+       char buf[SIZ];
 
        if (floorlist[(int)curr_floor][0]==0) load_floorlist();
        do {
@@ -1147,7 +1107,7 @@ void kill_floor(void) {
                newprompt("Delete which floor? ",buf,255);
                if (strlen(buf)==0) return;
                for (a=0; a<128; ++a)
-                       if (!strucmp(&floorlist[a][0],buf))
+                       if (!strcasecmp(&floorlist[a][0],buf))
                                floornum_to_delete = a;
                if (floornum_to_delete < 0) {
                        printf("No such floor.  Select one of:\n");