Re: git: 0667538b888c - main - ee: fix wprintw usage (highlighted by ncurses 6.5)
- In reply to: Cy Schubert : "Re: git: 0667538b888c - main - ee: fix wprintw usage (highlighted by ncurses 6.5)"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Jun 2024 14:03:12 UTC
On Thu 20 Jun 06:53, Cy Schubert wrote:
> In message <202406201344.45KDiqtm042956@gitrepo.freebsd.org>, Baptiste
> Daroussi
> n writes:
> > The branch main has been updated by bapt:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=0667538b888c1171932c6cf28b62fc19
> > d393e119
> >
> > commit 0667538b888c1171932c6cf28b62fc19d393e119
> > Author: Baptiste Daroussin <bapt@FreeBSD.org>
> > AuthorDate: 2024-06-20 13:42:59 +0000
> > Commit: Baptiste Daroussin <bapt@FreeBSD.org>
> > CommitDate: 2024-06-20 13:43:44 +0000
> >
> > ee: fix wprintw usage (highlighted by ncurses 6.5)
> >
> > Reported by: cy
> > ---
> > contrib/ee/ee.c | 42 +++++++++++++++++++++---------------------
> > 1 file changed, 21 insertions(+), 21 deletions(-)
> >
> > diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c
> > index 5576537f3fad..a14f9c0ead13 100644
> > --- a/contrib/ee/ee.c
> > +++ b/contrib/ee/ee.c
> > @@ -591,11 +591,11 @@ main(int argc, char *argv[])
> > {
> > wmove(com_win, 0, 0);
> > werase(com_win);
> > - wprintw(com_win, ree_no_file_msg);
> > + wprintw(com_win, "%s", ree_no_file_msg);
> > wrefresh(com_win);
> > edit_abort(0);
> > }
> > - wprintw(com_win, no_file_string);
> > + wprintw(com_win, "%s", no_file_string);
> > wrefresh(com_win);
> > }
> > else
> > @@ -615,7 +615,7 @@ main(int argc, char *argv[])
> > if (!nohighlight)
> > wstandout(info_win);
> > wmove(info_win, 5, 0);
> > - wprintw(info_win, separator);
> > + wprintw(info_win, "%s", separator);
> > wmove(info_win, 5, 5);
> > wprintw(info_win, "line %d col %d lines from top %d ",
> > curr_line->line_number, scr_horz, absolute_li
> > n);
> > @@ -1668,7 +1668,7 @@ command_prompt(void)
> > if (result == 0)
> > wprintw(com_win, unkn_cmd_str, cmd_str);
> > else
> > - wprintw(com_win, non_unique_cmd_msg);
> > + wprintw(com_win, "%s", non_unique_cmd_msg);
> >
> > wrefresh(com_win);
> >
> > @@ -1744,7 +1744,7 @@ command(char *cmd_str1)
> > wmove(com_win, 0, 0);
> > wclrtoeol(com_win);
> > if (in_file_name == NULL)
> > - wprintw(com_win, no_file_string);
> > + wprintw(com_win, "%s", no_file_string);
> > else
> > wprintw(com_win, current_file_str, in_file_name);
> > }
> > @@ -2245,7 +2245,7 @@ get_file(char *file_name)
> > {
> > if ((errno == ENOTDIR) || (errno == EACCES) || (errno =
> > = EROFS) || (errno == ETXTBSY) || (errno == EFAULT))
> > {
> > - wprintw(com_win, read_only_msg);
> > + wprintw(com_win, "%s", read_only_msg);
> > ro_flag = TRUE;
> > }
> > }
> > @@ -2282,7 +2282,7 @@ get_file(char *file_name)
> > wclrtoeol(com_win);
> > wprintw(com_win, file_read_lines_msg, in_file_name, curr_line->
> > line_number);
> > if (ro_flag)
> > - wprintw(com_win, read_only_msg);
> > + wprintw(com_win, "%s", read_only_msg);
> > wrefresh(com_win);
> > }
> > else if (can_read) /* not input_file and file is non-zero size */
> > @@ -2400,7 +2400,7 @@ finish(void)
> > if ((file_name == NULL) || (*file_name == '\0'))
> > {
> > wmove(com_win, 0, 0);
> > - wprintw(com_win, file_not_saved_msg);
> > + wprintw(com_win, "%s", file_not_saved_msg);
> > wclrtoeol(com_win);
> > wrefresh(com_win);
> > clear_com_win = TRUE;
> > @@ -2577,7 +2577,7 @@ search(int display_message)
> > {
> > wmove(com_win, 0, 0);
> > wclrtoeol(com_win);
> > - wprintw(com_win, searching_msg);
> > + wprintw(com_win, "%s", searching_msg);
> > wrefresh(com_win);
> > clear_com_win = TRUE;
> > }
> > @@ -3378,7 +3378,7 @@ menu_op(struct menu_entries menu_list[])
> > {
> > wmove(com_win, 0, 0);
> > werase(com_win);
> > - wprintw(com_win, menu_too_lrg_msg);
> > + wprintw(com_win, "%s", menu_too_lrg_msg);
> > wrefresh(com_win);
> > clear_com_win = TRUE;
> > return(0);
> > @@ -3630,10 +3630,10 @@ paint_menu(struct menu_entries menu_list[], int max_w
> > idth, int max_height,
> > {
> > if (list_size > 1)
> > wprintw(menu_win, "%c) ", item_alpha[min((count
> > er - 1), max_alpha_char)]);
> > - wprintw(menu_win, menu_list[counter].item_string);
> > + wprintw(menu_win, "%s", menu_list[counter].item_string)
> > ;
> > }
> > else
> > - wprintw(menu_win, more_below_str);
> > + wprintw(menu_win, "%s", more_below_str);
> > }
> > else
> > {
> > @@ -3663,7 +3663,7 @@ help(void)
> > wrefresh(help_win);
> > werase(com_win);
> > wmove(com_win, 0, 0);
> > - wprintw(com_win, press_any_key_msg);
> > + wprintw(com_win, "%s", press_any_key_msg);
> > wrefresh(com_win);
> > counter = wgetch(com_win);
> > if (counter == -1)
> > @@ -3790,7 +3790,7 @@ file_op(int arg)
> > if ((string == NULL) || (*string == '\0'))
> > {
> > wmove(com_win, 0, 0);
> > - wprintw(com_win, file_not_saved_msg);
> > + wprintw(com_win, "%s", file_not_saved_msg);
> > wclrtoeol(com_win);
> > wrefresh(com_win);
> > clear_com_win = TRUE;
> > @@ -3925,7 +3925,7 @@ Format(void)
> >
> > wmove(com_win, 0, 0);
> > wclrtoeol(com_win);
> > - wprintw(com_win, formatting_msg);
> > + wprintw(com_win, "%s", formatting_msg);
> > wrefresh(com_win);
> >
> > /*
> > @@ -3971,7 +3971,7 @@ Format(void)
> >
> > wmove(com_win, 0, 0);
> > wclrtoeol(com_win);
> > - wprintw(com_win, formatting_msg);
> > + wprintw(com_win, "%s", formatting_msg);
> > wrefresh(com_win);
> >
> > /*
> > @@ -4046,7 +4046,7 @@ Format(void)
> >
> > wmove(com_win, 0, 0);
> > wclrtoeol(com_win);
> > - wprintw(com_win, formatting_msg);
> > + wprintw(com_win, "%s", formatting_msg);
> > wrefresh(com_win);
> >
> > /*
> > @@ -4270,7 +4270,7 @@ dump_ee_conf(void)
> >
> > if (option == 0)
> > {
> > - wprintw(com_win, conf_not_saved_msg);
> > + wprintw(com_win, "%s", conf_not_saved_msg);
> > wrefresh(com_win);
> > return;
> > }
> > @@ -4293,7 +4293,7 @@ dump_ee_conf(void)
> > init_file = fopen(file_name, "w");
> > if (init_file == NULL)
> > {
> > - wprintw(com_win, conf_dump_err_msg);
> > + wprintw(com_win, "%s", conf_dump_err_msg);
> > wrefresh(com_win);
> > return;
> > }
> > @@ -4412,7 +4412,7 @@ spell_op(void)
> > command(shell_echo_msg);
> > adv_line();
> > wmove(com_win, 0, 0);
> > - wprintw(com_win, spell_in_prog_msg);
> > + wprintw(com_win, "%s", spell_in_prog_msg);
> > wrefresh(com_win);
> > command("<>!spell"); /* send contents of buffer to command 'spell'
> > and read the results back into the editor */
> > @@ -5001,7 +5001,7 @@ restrict_mode(void)
> > return(FALSE);
> >
> > wmove(com_win, 0, 0);
> > - wprintw(com_win, restricted_msg);
> > + wprintw(com_win, "%s", restricted_msg);
> > wclrtoeol(com_win);
> > wrefresh(com_win);
> > clear_com_win = TRUE;
> >
>
> I wonder if the editors/aee port might also want some tender loving care?
>
>
I checked and it does not, (which is probably a problem but hey :D
Bapt