ncurses 6.1 - patch 20180317

[ncurses.git] / ncurses / base / lib_inchstr.c

diff --git a/ncurses/base/lib_inchstr.c b/ncurses/base/lib_inchstr.c
index 6ff01687826eb09709f5c856174439ac8ec22340..bf30e3ce26637651c897e545023a09435ba47fd9 100644 (file)
--- a/ncurses/base/lib_inchstr.c
+++ b/ncurses/base/lib_inchstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2017 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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -40,25 +41,28 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inchstr.c,v 1.10 2001/06/02 23:37:58 skimo Exp $")
+MODULE_ID("$Id: lib_inchstr.c,v 1.16 2017/04/30 00:10:25 tom Exp $")
 
 NCURSES_EXPORT(int)
-winchnstr(WINDOW *win, chtype * str, int n)
+winchnstr(WINDOW *win, chtype *str, int n)
 {
     int i = 0;
 
-    T((T_CALLED("winchnstr(%p,%p,%d)"), win, str, n));
+    T((T_CALLED("winchnstr(%p,%p,%d)"), (void *) win, (void *) str, n));
 
-    if (!str)
-       returnCode(0);
+    if (!win || !str) {
+       i = ERR;
+    } else {
+       int row = win->_cury;
+       int col = win->_curx;
+       NCURSES_CH_T *text = win->_line[row].text;
 
-    if (win) {
-       for (; (n < 0 || (i < n)) && (win->_curx + i <= win->_maxx); i++)
-           str[i] =
-               CharOf(win->_line[win->_cury].text[win->_curx + i]) |
-               AttrOf(win->_line[win->_cury].text[win->_curx + i]);
+       for (; (n < 0 || (i < n)) && (col + i <= win->_maxx); i++) {
+           str[i] = (((chtype) CharOf(text[col + i]) & A_CHARTEXT) |
+                     AttrOf(text[col + i]));
+       }
+       str[i] = (chtype) 0;
     }
-    str[i] = (chtype) 0;
 
     returnCode(i);
 }