]> code.citadel.org Git - citadel.git/blobdiff - citadel/commands.c
* The size constant "256" which shows up everywhere as a buffer size has now
[citadel.git] / citadel / commands.c
index 3a6fb8af6681f3a53cac56cc76cc2c4f61547f8f..3a67eb77eff00991902fe841f57841fef638d30b 100644 (file)
@@ -56,21 +56,22 @@ struct citcmd {
 
 
 int rc_exp_beep;
-char rc_exp_cmd[256];
+char rc_exp_cmd[1024];
 int rc_allow_attachments;
 int rc_display_message_numbers;
 int rc_force_mail_prompts;
 int rc_remember_passwords;
 int rc_ansi_color;
 int num_urls = 0;
-char urls[MAXURLS][256];
-char rc_url_cmd[256];
+char urls[MAXURLS][1024];
+char rc_url_cmd[1024];
 
 char *gl_string;
 int next_lazy_cmd = 5;
 
 int lines_printed = 0;         /* line count for paginator */
 extern int screenwidth, screenheight;
+extern int termn8;
 
 struct citcmd *cmdlist = NULL;
 
@@ -84,6 +85,39 @@ int enable_color = 0;                        /* nonzero for ANSI color */
 
 
 
+/*
+ * If an interesting key has been pressed, return its value, otherwise 0
+ */
+char was_a_key_pressed(void) {
+       fd_set rfds;
+       struct timeval tv;
+       int the_character;
+       int retval;
+
+       FD_ZERO(&rfds);
+       FD_SET(0, &rfds);
+       tv.tv_sec = 0;
+       tv.tv_usec = 0;
+       retval = select(1, &rfds, NULL, NULL, &tv); 
+
+       /* Careful!  Disable keepalives during keyboard polling; we're probably
+        * in the middle of a data transfer from the server, in which case
+        * sending a NOOP would throw the client protocol out of sync.
+        */
+       if (FD_ISSET(0, &rfds)) {
+               set_keepalives(KA_NO);
+               the_character = inkey();
+               set_keepalives(KA_YES);
+       }
+       else {
+               the_character = 0;
+       }
+       return(the_character);
+}
+
+
+
+
 
 /*
  * Check to see if we need to pause at the end of a screen.
@@ -93,15 +127,22 @@ int enable_color = 0;                      /* nonzero for ANSI color */
  */
 int checkpagin(int lp, int pagin, int height)
 {
+       int thekey;
+
+       if (sigcaught) return(lp);
+       thekey = was_a_key_pressed();
+       if ( (thekey == NEXT_KEY) || (thekey == STOP_KEY)) sigcaught = thekey;
+       if (sigcaught) return(lp);
+
        if (!pagin) return(0);
        if (lp>=(height-1)) {
                set_keepalives(KA_NO);
                hit_any_key();
                set_keepalives(KA_YES);
                return(0);
-               }
-       return(lp);
        }
+       return(lp);
+}
 
 
 
@@ -113,7 +154,13 @@ void pprintf(const char *format, ...) {
         va_list arg_ptr;
        static char buf[4096];  /* static for performance, change if needed */
        int i;
-  
+
+       /* If sigcaught is nonzero, a keypress has interrupted this and we
+        * should just drain output.
+        */
+       if (sigcaught) return;
+       /* Otherwise, start spewing... */ 
         va_start(arg_ptr, format);   
         vsprintf(buf, format, arg_ptr);   
         va_end(arg_ptr);   
@@ -136,38 +183,123 @@ void pprintf(const char *format, ...) {
  */
 void print_express(void)
 {
-       char buf[256];
+       char buf[1024];
        FILE *outpipe;
+       time_t timestamp;
+       struct tm *stamp;
+       int flags = 0;
+       char sender[64];
+       char node[64];
 
        if (express_msgs == 0)
                return;
-       express_msgs = 0;
-       serv_puts("PEXP");
-       serv_gets(buf);
-       if (buf[0] != '1')
-               return;
 
-       if (strlen(rc_exp_cmd) > 0) {
-               outpipe = popen(rc_exp_cmd, "w");
-               if (outpipe != NULL) {
-                       while (serv_gets(buf), strcmp(buf, "000")) {
-                               fprintf(outpipe, "%s\n", buf);
-                       }
-                       pclose(outpipe);
-                       return;
-               }
-       }
-       /* fall back to built-in express message display */
        if (rc_exp_beep) {
                putc(7, stdout);
        }
-       color(BRIGHT_RED);
-       printf("\r---\n");
-       while (serv_gets(buf), strcmp(buf, "000")) {
-               printf("%s\n", buf);
+       if (strlen(rc_exp_cmd) == 0) {
+               color(BRIGHT_RED);
+               printf("\r---");
+       }
+       
+       while (express_msgs != 0) {
+               serv_puts("GEXP");
+               serv_gets(buf);
+               if (buf[0] != '1')
+                       return;
+       
+               express_msgs = extract_int(&buf[4], 0);
+               timestamp = extract_long(&buf[4], 1);
+               flags = extract_int(&buf[4], 2);
+               extract(sender, &buf[4], 3);
+               extract(node, &buf[4], 4);
+       
+               stamp = localtime(&timestamp);
+
+               /* If the page is a Logoff Request, honor it. */
+               if (flags & 2) {
+                       termn8 = 1;
+                       return;
+               }
+       
+               if (strlen(rc_exp_cmd) > 0) {
+                       outpipe = popen(rc_exp_cmd, "w");
+                       if (outpipe != NULL) {
+                               /* Header derived from flags */
+                               if (flags & 2)
+                                       fprintf(outpipe,
+                                              "Please log off now, as requested ");
+                               else if (flags & 1)
+                                       fprintf(outpipe, "Broadcast message ");
+                               else if (flags & 4)
+                                       fprintf(outpipe, "Chat request ");
+                               else
+                                       fprintf(outpipe, "Message ");
+                               /* Timestamp.  Can this be improved? */
+                               if (stamp->tm_hour == 0 || stamp->tm_hour == 12)
+                                       fprintf(outpipe, "at 12:%02d%cm",
+                                               stamp->tm_min, 
+                                               stamp->tm_hour ? 'p' : 'a');
+                               else if (stamp->tm_hour > 12)           /* pm */
+                                       fprintf(outpipe, "at %d:%02dpm",
+                                               stamp->tm_hour - 12,
+                                               stamp->tm_min);
+                               else                                    /* am */
+                                       fprintf(outpipe, "at %d:%02dam",
+                                               stamp->tm_hour, stamp->tm_min);
+                               fprintf(outpipe, " from %s", sender);
+                               if (strncmp(serv_info.serv_nodename, node, 32))
+                                       fprintf(outpipe, " @%s", node);
+                               fprintf(outpipe, ":\n");
+                               while (serv_gets(buf), strcmp(buf, "000")) {
+                                       fprintf(outpipe, "%s\n", buf);
+                               }
+                               pclose(outpipe);
+                               if (express_msgs == 0)
+                                       return;
+                               continue;
+                       }
+               }
+               /* fall back to built-in express message display */
+               printf("\n");
+
+               /* Header derived from flags */
+               if (flags & 2)
+                       printf("Please log off now, as requested ");
+               else if (flags & 1)
+                       printf("Broadcast message ");
+               else if (flags & 4)
+                       printf("Chat request ");
+               else
+                       printf("Message ");
+       
+               /* Timestamp.  Can this be improved? */
+               if (stamp->tm_hour == 0 || stamp->tm_hour == 12)/* 12am/12pm */
+                       printf("at 12:%02d%cm", stamp->tm_min, 
+                               stamp->tm_hour ? 'p' : 'a');
+               else if (stamp->tm_hour > 12)                   /* pm */
+                       printf("at %d:%02dpm",
+                               stamp->tm_hour - 12, stamp->tm_min);
+               else                                            /* am */
+                       printf("at %d:%02dam", stamp->tm_hour, stamp->tm_min);
+               
+               /* Sender */
+               printf(" from %s", sender);
+       
+               /* Remote node, if any */
+               if (strncmp(serv_info.serv_nodename, node, 32))
+                       printf(" @%s", node);
+       
+               printf(":\n");
+       
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       printf("%s", buf);
+               }
        }
-       printf("---\n");
+       printf("\n---\n");
        color(BRIGHT_WHITE);
+
+
 }
 
 
@@ -182,22 +314,20 @@ void set_keepalives(int s)
 
 static time_t idlet = 0;
 static void really_do_keepalive(void) {
-       char buf[256];
+       char buf[1024];
 
        time(&idlet);
-       if (keepalives_enabled != KA_NO) {
+       if (keepalives_enabled == KA_YES) {
                serv_puts("NOOP");
-               if (keepalives_enabled == KA_YES) {
-                       serv_gets(buf);
-                       if (buf[3] == '*') {
-                               express_msgs = 1;
-                               if (ok_to_interrupt == 1) {
-                                       printf("\r%64s\r", "");
-                                       print_express();
-                                       printf("%s%c ", room_name,
-                                              room_prompt(room_flags));
-                                       fflush(stdout);
-                               }
+               serv_gets(buf);
+               if (buf[3] == '*') {
+                       express_msgs = 1;
+                       if (ok_to_interrupt == 1) {
+                               printf("\r%64s\r", "");
+                               print_express();
+                               printf("%s%c ", room_name,
+                                      room_prompt(room_flags));
+                               fflush(stdout);
                        }
                }
        }
@@ -527,7 +657,7 @@ int lkey(void)
 void load_command_set(void)
 {
        FILE *ccfile;
-       char buf[256];
+       char buf[1024];
        struct citcmd *cptr;
        struct citcmd *lastcmd = NULL;
        int a, d;
@@ -571,7 +701,7 @@ void load_command_set(void)
                perror("commands: cannot open citadel.rc");
                logoff(errno);
        }
-       while (fgets(buf, 256, ccfile) != NULL) {
+       while (fgets(buf, sizeof buf, ccfile) != NULL) {
                while ((strlen(buf) > 0) ? (isspace(buf[strlen(buf) - 1])) : 0)
                        buf[strlen(buf) - 1] = 0;
 
@@ -699,7 +829,7 @@ char *cmd_expand(char *strbuf, int mode)
 {
        int a;
        static char exp[64];
-       char buf[256];
+       char buf[1024];
 
        strcpy(exp, strbuf);
 
@@ -790,6 +920,13 @@ int getcmd(char *argbuf)
        int this_lazy_cmd;
        struct citcmd *cptr;
 
+       /*
+        * Starting a new command now, so set sigcaught to 0.  This variable
+        * is set to nonzero (usually NEXT_KEY or STOP_KEY) if a command has
+        * been interrupted by a keypress.
+        */
+       sigcaught = 0;
+
        /* Switch color support on or off if we're in user mode */
        if (rc_ansi_color == 3) {
                if (userflags & US_COLOR)
@@ -921,8 +1058,7 @@ int getcmd(char *argbuf)
 /*
  * set tty modes.  commands are:
  * 
- * 0 - set to bbs mode, intr/quit disabled
- * 1 - set to bbs mode, intr/quit enabled
+ * 01- set to bbs mode
  * 2 - save current settings for later restoral
  * 3 - restore saved settings
  */
@@ -944,17 +1080,13 @@ void sttybbs(int cmd)
                live.c_oflag = OPOST | ONLCR;
                live.c_lflag = ISIG | NOFLSH;
 
-               if (cmd == SB_YES_INTR) {
-                       live.c_cc[VINTR] = NEXT_KEY;
-                       live.c_cc[VQUIT] = STOP_KEY;
-                       signal(SIGINT, *sighandler);
-                       signal(SIGQUIT, *sighandler);
-               } else {
-                       signal(SIGINT, SIG_IGN);
-                       signal(SIGQUIT, SIG_IGN);
-                       live.c_cc[VINTR] = (-1);
-                       live.c_cc[VQUIT] = (-1);
-               }
+               live.c_cc[VINTR] = (-1);
+               live.c_cc[VQUIT] = (-1);
+
+#ifdef hpux
+               live.c_cc[VMIN] = 0;
+               live.c_cc[VTIME] = 0;
+#endif
 
                /* do we even need this stuff anymore? */
                /* live.c_line=0; */
@@ -1011,13 +1143,13 @@ void display_help(char *name)
 /*
  * fmout()  -  Citadel text formatter and paginator
  */
-int fmout(int width, FILE * fp, char pagin, int height, int starting_lp, char subst)
-                       /* screen width to use */
-                       /* file to read from, or NULL to read from server */
-                       /* nonzero if we should use the paginator */
-                       /* screen height to use */
-                       /* starting value for lines_printed, -1 for global */
-                       /* nonzero if we should use hypertext mode */
+int fmout(
+       int width,      /* screen width to use */
+       FILE *fp,       /* file to read from, or NULL to read from server */
+       char pagin,     /* nonzero if we should use the paginator */
+       int height,     /* screen height to use */
+       int starting_lp,/* starting value for lines_printed, -1 for global */
+       char subst)     /* nonzero if we should use hypertext mode */
 {
        int a, b, c, d, old;
        int real = (-1);
@@ -1035,13 +1167,7 @@ int fmout(int width, FILE * fp, char pagin, int height, int starting_lp, char su
        strcpy(buffer, "");
        c = 1;                  /* c is the current pos */
 
-       sigcaught = 0;
-       sttybbs(1);
-
 FMTA:  while ((eof_flag == 0) && (strlen(buffer) < 126)) {
-       
-               if (sigcaught)
-                       goto OOPS;
                if (fp != NULL) {       /* read from file */
                        if (feof(fp))
                                eof_flag = 1;
@@ -1129,17 +1255,18 @@ FMTA:   while ((eof_flag == 0) && (strlen(buffer) < 126)) {
                c = 1;
                ++lines_printed;
                lines_printed = checkpagin(lines_printed, pagin, height);
+               if (sigcaught) goto OOPS;
                strcpy(aaa, "");
                goto FMTA;
        }
        goto FMTA;
 
-       /* signal caught; drain the server */
-      OOPS:do {
+       /* keypress caught; drain the server */
+OOPS:  do {
                serv_gets(aaa);
        } while (strcmp(aaa, "000"));
 
-      FMTEND:printf("\n");
+FMTEND:        printf("\n");
        ++lines_printed;
        lines_printed = checkpagin(lines_printed, pagin, height);
        return (sigcaught);
@@ -1282,7 +1409,7 @@ char keymenu(char *menuprompt, char *menustring) {
        int i, c, a;
        int choices;
        int do_prompt = 0;
-       char buf[256];
+       char buf[1024];
        int ch;
        int display_prompt = 1;