* I dunno

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index e83696d021e870fbb3a859b7bcabfd82717198d5..bfd1c652116dacff39c74a243d7de7644fbf6863 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -56,15 +56,15 @@ 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][SIZ];
+char rc_url_cmd[SIZ];
 
 char *gl_string;
 int next_lazy_cmd = 5;
@@ -183,7 +183,7 @@ void pprintf(const char *format, ...) {
  */
 void print_express(void)
 {
-       char buf[256];
+       char buf[1024];
        FILE *outpipe;
        time_t timestamp;
        struct tm *stamp;
@@ -215,6 +215,12 @@ void print_express(void)
                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");
@@ -293,10 +299,6 @@ void print_express(void)
        printf("\n---\n");
        color(BRIGHT_WHITE);
 
-       /* If the page is a Logoff Request, honor it. */
-       if (flags & 2) {
-               termn8 = 1;
-       }
 
 }
 
@@ -312,7 +314,7 @@ 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_YES) {
@@ -655,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;
@@ -699,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;
 
@@ -827,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);
 
@@ -1193,7 +1195,7 @@ FMTA:     while ((eof_flag == 0) && (strlen(buffer) < 126)) {
 
        if ( (!strncasecmp(buffer, "http://", 7))
           || (!strncasecmp(buffer, "ftp://", 6)) ) {
-               safestrncpy(urls[num_urls], buffer, 255);
+               safestrncpy(urls[num_urls], buffer, (SIZ-1));
                for (a=0; a<strlen(urls[num_urls]); ++a) {
                        b = urls[num_urls][a];
                        if ( (b==' ') || (b==')') || (b=='>') || (b==10)
@@ -1407,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;