Enlarge help string buffers

Even on 80x25 terminals, SHORT_STRING (128 byte) may not be enough so use
LONG_STRING (1k) as STRING (256 byte) may well be too short for wider
terminals. Closes debian #4152777.

diff --git a/addrbook.c b/addrbook.c
index 4cfde19af3ae688bae179e8f44251fa524c44d5b..f3f3dc9d0076352ac8d2f58fa75d9bc55e6f3c64 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -136,7 +136,7 @@ void mutt_alias_menu (char *buf, size_t buflen, ALIAS *aliases)
   int t = -1;
   int i, done = 0;
   int op;
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
 
   int omax;
   

diff --git a/browser.c b/browser.c
index 073a5fa7ee58ddceb8df387c9a3254adb9af90ef..c200b9423cb3ab0e7da6f904d252451823fa51af 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -536,7 +536,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
 {
   char buf[_POSIX_PATH_MAX];
   char prefix[_POSIX_PATH_MAX] = "";
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   char title[STRING];
   struct browser_state state;
   MUTTMENU *menu;

diff --git a/compose.c b/compose.c
index 321397100b13194c48b5fbb13820bf9c3d611ee0..001bdf44dc94bdfad6670ffce0cb65830e25a588 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -491,7 +491,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
                    size_t fcclen,
                    HEADER *cur)   /* current message */
 {
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   char buf[LONG_STRING];
   char fname[_POSIX_PATH_MAX];
   MUTTMENU *menu;

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 46c1300f780df4e65465bde5e928dd1ed28c7f35..a64f04afcf87b0468756fceabae242ebc67aafa8 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -3586,7 +3586,7 @@ static crypt_key_t *crypt_select_key (crypt_key_t *keys,
   crypt_key_t **key_table;
   MUTTMENU *menu;
   int i, done = 0;
-  char helpstr[SHORT_STRING], buf[LONG_STRING];
+  char helpstr[LONG_STRING], buf[LONG_STRING];
   crypt_key_t *k;
   int (*f) (const void *, const void *);
   int menu_to_use = 0;

diff --git a/curs_main.c b/curs_main.c
index 2e2750577487a9da7531a46dda83818321f4699c..ec747e28777aa783a398ed06adc1db8b91a47899 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -414,7 +414,7 @@ struct mapping_t IndexHelp[] = {
  */
 int mutt_index_menu (void)
 {
-  char buf[LONG_STRING], helpstr[SHORT_STRING];
+  char buf[LONG_STRING], helpstr[LONG_STRING];
   int op = OP_NULL;
   int done = 0;                /* controls when to exit the "event" loop */
   int i = 0, j;

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 2a388f9d87fc170ec224cd65a550be99c04132a4..7883465383d6791a09c74876ddb3a5e5784fc9ac 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -592,7 +592,7 @@ static int ssl_check_certificate (sslsockdata * data)
 {
   char *part[] =
   {"/CN=", "/Email=", "/O=", "/OU=", "/L=", "/ST=", "/C="};
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   char buf[SHORT_STRING];
   MUTTMENU *menu;
   int done, row, i;

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 136ef931b61497b3858050529db9162186595711..92cae5401a2f6f208e97b4952ce252d3f4abeaeb 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -461,7 +461,7 @@ static int tls_check_certificate (CONNECTION* conn)
 {
   tlssockdata *data = conn->sockdata;
   gnutls_session state = data->state;
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   char buf[SHORT_STRING];
   char fpbuf[SHORT_STRING];
   size_t buflen;

diff --git a/pgpkey.c b/pgpkey.c
index 96248eb94292aad847b3746efb8d8f8a1a51344d..e7f7717f58fa4157933546b3aa3b2f31e799379a 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -446,7 +446,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys,
   pgp_uid_t **KeyTable;
   MUTTMENU *menu;
   int i, done = 0;
-  char helpstr[SHORT_STRING], buf[LONG_STRING], tmpbuf[STRING];
+  char helpstr[LONG_STRING], buf[LONG_STRING], tmpbuf[STRING];
   char cmd[LONG_STRING], tempfile[_POSIX_PATH_MAX];
   FILE *fp, *devnull;
   pid_t thepid;

diff --git a/postpone.c b/postpone.c
index 2413262a05deed0f956f99301f8bf0761ca01b18..bcb86072aab2df16d5748dbbf3b91bddf9a89bd5 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -157,7 +157,7 @@ static HEADER *select_msg (void)
 {
   MUTTMENU *menu;
   int i, done=0, r=-1;
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   short orig_sort;
 
   menu = mutt_new_menu ();

diff --git a/query.c b/query.c
index 4dabceedd7fe6cf6a875c397757a165332c8ce8b..1f88dbee7e8b92f15152d23a9794428a1f0461ee 100644 (file)
--- a/query.c
+++ b/query.c
@@ -285,7 +285,7 @@ static void query_menu (char *buf, size_t buflen, QUERY *results, int retbuf)
   QUERY *queryp = NULL;
   int i, done = 0;
   int op;
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   char title[STRING];
 
   snprintf (title, sizeof (title), _("Query")); /* FIXME */

diff --git a/recvattach.c b/recvattach.c
index 82e912659590d664c75acf2827a83f8af3b4c61b..c3a12d6ae68f7d80ce76de2950e167c50388b70e 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -905,7 +905,7 @@ void mutt_view_attachments (HEADER *hdr)
   int secured = 0;
   int need_secured = 0;
 
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   MUTTMENU *menu;
   BODY *cur = NULL;
   MESSAGE *msg;

diff --git a/remailer.c b/remailer.c
index 78680fd22245c3b5abc0286333107e42890f6a67..89317f5ee8af62dbbd1c84cb5a4e94030673af04 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -504,7 +504,7 @@ void mix_make_chain (LIST **chainp, int *redraw)
   struct coord *coords = NULL;
   
   MUTTMENU *menu;
-  char helpstr[SHORT_STRING];
+  char helpstr[LONG_STRING];
   short loop = 1;
   int op;