From nobody Thu Jun 27 09:03:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W8szl4s0Lz5PGf3; Thu, 27 Jun 2024 09:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8szl3xLQz4YPk; Thu, 27 Jun 2024 09:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P5Phl9vaF80NcQ8UgiIITMiWugkOfFgMn7GQ/EIQ93g=; b=yadDTXWdSMcjud9HITU0E69HN6KwCkHOQVN9rgNU5wqkLVUroWfnZftwlk7Y48wIXSGmrA VPLs2vEfp/AooZp80A8NrgventhlaXGQASSWvE716z4Fjslcz1ys7Ek/cFwgzlm+58reVK SxgBYlJaVLlJoapd4IWzOAwwG7/7RcWYtmVlw5QvsYOVd30dUHj3obb9qAXZuF2gMyJGhr zvG5mH0iXXiWAjwMMbQrKyN+pBvI/RAeyxwUvPh0YPbnsXMQk5npVzfostwSXjHb0I+ntn AGdJnKMaE8181rew6cjtEyp05wObfOsjHgY2S1v82IOHFVScfqdF317WvMUqGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478995; a=rsa-sha256; cv=none; b=dJ5UXGOYo5yrJ8hOYHDbhb03iQvCrSNLDDDyGwLhMBAFn+PIOrUBBvvaR+kI9nqUB3XHw2 A76OPlyhaev+XfAouIPtDe1RlgNhGZba8LL886tFadT3/uXMP6d+dEn2SnpLROXc3q7trt 9duti0pDVBhZnwT3hLMhyyITIHwuj8ZvIg/BuUdfge2Lnv3NxB7321BTBQkvWZMe6jT0OO kQQNxDJ8IiXsmfLkqstmDOzcOUYvUM00PLEinm+yQmv5MrgT6Vb6r3/pxvr8yIgJtD9ELg WpES6emM+NGFIXMfZUD3rtG28qGuAp49d6qzi/KHvxCAoP0m2YSW/bVqcE/FyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P5Phl9vaF80NcQ8UgiIITMiWugkOfFgMn7GQ/EIQ93g=; b=U3kX6SRp+Wj+70oYMWMzBGBPd+0ZtUmZSrzxDWUKpST1+UIhFw1Raq0vKOe05dPmqvUwet jTRMfWhzQCOnBerGodcow33KvJ3gfb0NriO26CHJGTQyTH+F1OiGkyVdyfwsGupQIFU9Kq UfSsnHvdMTRyBcmVl4HWqWB6h6+wzrjea7FqNrVo0G7eHhLCYsnFRI2NamidL+nAwQ+MlH pAo/AuYFg83/IfzNkzAsc9SrvH+beEv8cVaj7HzSjvGNOK+GJwtiZIWsIdDwdlFlwxf+qt D9IgtkBFwRQd293RvvI1bMdYAiM+5etJgM8/bpH3yUmpP+t0qUS7abGJLL9HGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8szl3XWXz1LgG; Thu, 27 Jun 2024 09:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R93FSD027825; Thu, 27 Jun 2024 09:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R93Fg9027822; Thu, 27 Jun 2024 09:03:15 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:03:15 GMT Message-Id: <202406270903.45R93Fg9027822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1cac66d0db77 - stable/13 - ee: fix wprintw usage (highlighted by ncurses 6.5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1cac66d0db7737a7f1c394b2f50d058bd2a8c8d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1cac66d0db7737a7f1c394b2f50d058bd2a8c8d9 commit 1cac66d0db7737a7f1c394b2f50d058bd2a8c8d9 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:42:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:01:57 +0000 ee: fix wprintw usage (highlighted by ncurses 6.5) Reported by: cy (cherry picked from commit 0667538b888c1171932c6cf28b62fc19d393e119) --- 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 70a44076f882..5976152414cb 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -595,11 +595,11 @@ 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 @@ -619,7 +619,7 @@ 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_lin); @@ -1666,7 +1666,7 @@ command_prompt() 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); @@ -1742,7 +1742,7 @@ 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); } @@ -2253,7 +2253,7 @@ 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; } } @@ -2290,7 +2290,7 @@ 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 */ @@ -2409,7 +2409,7 @@ finish() /* prepare to exit edit session */ 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; @@ -2589,7 +2589,7 @@ 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; } @@ -3381,7 +3381,7 @@ 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); @@ -3637,10 +3637,10 @@ int off_start, vert_size; { if (list_size > 1) wprintw(menu_win, "%c) ", item_alpha[min((counter - 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 { @@ -3670,7 +3670,7 @@ help() 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) @@ -3798,7 +3798,7 @@ 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; @@ -3932,7 +3932,7 @@ Format() /* format the paragraph according to set margins */ wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -3978,7 +3978,7 @@ Format() /* format the paragraph according to set margins */ wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4053,7 +4053,7 @@ Format() /* format the paragraph according to set margins */ wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4276,7 +4276,7 @@ dump_ee_conf() if (option == 0) { - wprintw(com_win, conf_not_saved_msg); + wprintw(com_win, "%s", conf_not_saved_msg); wrefresh(com_win); return; } @@ -4299,7 +4299,7 @@ dump_ee_conf() 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; } @@ -4417,7 +4417,7 @@ spell_op() /* check spelling of words in the editor */ 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 */ @@ -5007,7 +5007,7 @@ restrict_mode() 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;