Commit 64f58f42 authored by Rocco Rutte's avatar Rocco Rutte

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.
parent e9191b89
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 ();
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment