ncurses 6.1 - patch 20191019

[ncurses.git] / ncurses / widechar / lib_in_wchnstr.c

diff --git a/ncurses/widechar/lib_in_wchnstr.c b/ncurses/widechar/lib_in_wchnstr.c
index 41ba18ccdf008a9c13df75c82c48884ea89e0205..57cc2ca6e73f4e1305a9e688ed82db7ecaf790c5 100644 (file)
--- a/ncurses/widechar/lib_in_wchnstr.c
+++ b/ncurses/widechar/lib_in_wchnstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002,2004 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2002-2007,2009 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Author: Thomas Dickey 2002,2004                                          *
+ * Author: Thomas Dickey                                                    *
  ****************************************************************************/
 
 /*
@@ -39,27 +39,35 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_in_wchnstr.c,v 1.3 2004/05/16 00:12:30 tom Exp $")
+MODULE_ID("$Id: lib_in_wchnstr.c,v 1.8 2009/10/24 22:37:48 tom Exp $")
 
 NCURSES_EXPORT(int)
-win_wchnstr(WINDOW *win, cchar_t * wchstr, int n)
+win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
 {
     int code = OK;
 
-    TR(TRACE_CALLS, (T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n));
+    T((T_CALLED("win_wchnstr(%p,%p,%d)"), (void *) win, (void *) wchstr, n));
     if (win != 0
        && wchstr != 0) {
+       NCURSES_CH_T *src;
        int row, col;
-       int j;
+       int j, k, limit;
 
        getyx(win, row, col);
+       limit = getmaxx(win) - col;
+       src = &(win->_line[row].text[col]);
 
        if (n < 0) {
-           n = getmaxx(win) + 1 - getcurx(win);
+           n = limit;
+       } else if (n > limit) {
+           n = limit;
        }
-       for (j = 0; j < n; ++j) {
-           wchstr[j] = win->_line[row].text[col + j];
+       for (j = k = 0; j < n; ++j) {
+           if (j == 0 || !WidecExt(src[j]) || isWidecBase(src[j])) {
+               wchstr[k++] = src[j];
+           }
        }
+       memset(&(wchstr[k]), 0, sizeof(*wchstr));
        T(("result = %s", _nc_viscbuf(wchstr, n)));
     } else {
        code = ERR;