ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- nano.c:help_init() - Fix crashing in do_help when COLS < 23 (David Benbennick) 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1441 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2003-02-10 02:32:58 +00:00
parent 2ddd75e705
commit 3a78406d56
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -13,6 +13,8 @@ CVS code
main() main()
- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP - Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP
(David Benbennick). (David Benbennick).
help_init()
- Fix crashing in do_help when COLS < 23 (David Benbennick).
- rcfile.c: - rcfile.c:
colortoint() colortoint()
- Don't bomb after invalid color and print bad color name - Don't bomb after invalid color and print bad color name

13
nano.c
View File

@ -389,9 +389,12 @@ void help_init(void)
/* If we're on the main list, we also count the toggle help text. /* If we're on the main list, we also count the toggle help text.
* Each line has "M-%c\t\t\t", which fills 24 columns, plus at most * Each line has "M-%c\t\t\t", which fills 24 columns, plus at most
* COLS - 24 characters, plus '\n'.*/ * COLS - 24 characters, plus '\n'.*/
if (currshortcut == main_list) if (currshortcut == main_list) {
size_t endislen = strlen(_("enable/disable"));
for (t = toggles; t != NULL; t = t->next) for (t = toggles; t != NULL; t = t->next)
allocsize += COLS - 17; allocsize += 8 + strlen(t->desc) + endislen;
}
#endif /* !NANO_SMALL */ #endif /* !NANO_SMALL */
/* help_text has been freed and set to NULL unless the user resized /* help_text has been freed and set to NULL unless the user resized
@ -448,16 +451,16 @@ void help_init(void)
*(ptr++) = '\t'; *(ptr++) = '\t';
assert(s->help != NULL); assert(s->help != NULL);
ptr += sprintf(ptr, "%.*s\n", COLS - 24, s->help); ptr += sprintf(ptr, "%.*s\n", COLS > 24 ? COLS - 24 : 0, s->help);
} }
#ifndef NANO_SMALL #ifndef NANO_SMALL
/* And the toggles... */ /* And the toggles... */
if (currshortcut == main_list) if (currshortcut == main_list)
for (t = toggles; t != NULL; t = t->next) { for (t = toggles; t != NULL; t = t->next) {
ptr += sprintf(ptr, "M-%c\t\t\t", t->val - 32);
assert(t->desc != NULL); assert(t->desc != NULL);
ptr += sprintf(ptr, _("%.*s enable/disable\n"), COLS - 24, t->desc); ptr += sprintf(ptr, "M-%c\t\t\t%s %s\n", t->val - 32, t->desc,
_("enable/disable"));
} }
#endif /* !NANO_SMALL */ #endif /* !NANO_SMALL */