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

in help_init(), when calculating allocsize, take multibyte characters 

into account, and keep the column number limits consistent


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2416 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-03-22 02:51:01 +00:00
parent b41df4a140
commit c4daf5d49e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,9 @@ CVS code -
do_browser() do_browser()
- Rename variable lineno to fileline to avoid confusion. (DLR) - Rename variable lineno to fileline to avoid confusion. (DLR)
- nano.c: - nano.c:
help_init()
- When calculating allocsize, take multibyte characters into
account, and keep the column number limits consistent. (DLR)
print1opt() print1opt()
- Don't include longflag if HAVE_GETOPT_LONG isn't defined. - Don't include longflag if HAVE_GETOPT_LONG isn't defined.
Rename this function to print1opt_full(), leave out the Rename this function to print1opt_full(), leave out the

8
src/nano.c
View File

@ -264,7 +264,7 @@ void mouse_init(void)
* help_text should be NULL initially. */ * help_text should be NULL initially. */
void help_init(void) void help_init(void)
{ {
size_t allocsize = 1; /* Space needed for help_text. */ size_t allocsize = 0; /* Space needed for help_text. */
const char *htx; /* Untranslated help message. */ const char *htx; /* Untranslated help message. */
char *ptr; char *ptr;
const shortcut *s; const shortcut *s;
@ -391,8 +391,8 @@ void help_init(void)
/* The space needed for the shortcut lists, at most COLS characters, /* The space needed for the shortcut lists, at most COLS characters,
* plus '\n'. */ * plus '\n'. */
allocsize += (COLS < 21 ? 21 : COLS + 1) * allocsize += (COLS < 24 ? (24 * mb_cur_max()) :
length_of_list(currshortcut); ((COLS + 1) * mb_cur_max())) * length_of_list(currshortcut);
#ifndef NANO_SMALL #ifndef NANO_SMALL
/* 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.
@ -411,7 +411,7 @@ void help_init(void)
free(help_text); free(help_text);
/* Allocate space for the help text. */ /* Allocate space for the help text. */
help_text = charalloc(allocsize); help_text = charalloc(allocsize + 1);
/* Now add the text we want. */ /* Now add the text we want. */
strcpy(help_text, htx); strcpy(help_text, htx);