[PATCH] 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.
---
addrbook.c | 2 +-
browser.c | 2 +-
compose.c | 2 +-
crypt-gpgme.c | 2 +-
curs_main.c | 2 +-
mutt_ssl.c | 2 +-
mutt_ssl_gnutls.c | 2 +-
pgpkey.c | 2 +-
postpone.c | 2 +-
query.c | 2 +-
recvattach.c | 2 +-
remailer.c | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/addrbook.c b/addrbook.c
index 4cfde19..f3f3dc9 100644
--- 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 073a5fa..c200b94 100644
--- 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 3213971..001bdf4 100644
--- 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 46c1300..a64f04a 100644
--- 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 2e27505..ec747e2 100644
--- 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 2a388f9..7883465 100644
--- 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 136ef93..92cae54 100644
--- 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 96248eb..e7f7717 100644
--- 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 2413262..bcb8607 100644
--- 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 4dabcee..1f88dbe 100644
--- 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 82e9126..c3a12d6 100644
--- 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 78680fd..89317f5 100644
--- 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;
--
1.5.0.4.1009.g31b4