X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_addstr.c;h=ea449794b1ab8b7d3c99c5dad8f4e7754696b7ec;hp=a1e8829dd7f5e255cf8e2d05dfe178e0248b4ae7;hb=fe04a14d6f411207899cdf9b2e9e40d952938199;hpb=7104baa59ff713e8339b3b20edcf4234a5af6200

diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index a1e8829d..ea449794 100644
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -45,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.57 2020/12/05 20:06:19 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.58 2022/06/11 20:12:04 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -59,10 +59,11 @@ waddnstr(WINDOW *win, const char *astr, int n)
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
 	code = OK;
+
+	TR(TRACE_VIRTPUT, ("str is not null, length = %d",
+			   ((n > 0) ? n : (int) strlen(str))));
 	if (n < 0)
 	    n = INT_MAX;
-
-	TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));
 	while ((*str != '\0') && (n-- > 0)) {
 	    NCURSES_CH_T ch;
 	    TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str)));
@@ -231,10 +232,11 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
 	code = OK;
+
+	TR(TRACE_VIRTPUT, ("str is not null, length = %d",
+			   ((n > 0) ? n : (int) wcslen(str))));
 	if (n < 0)
 	    n = INT_MAX;
-
-	TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));
 	while ((*str != L('\0')) && (n-- > 0)) {
 	    NCURSES_CH_T ch;
 	    TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str));