ncurses 5.7 - patch 20101225

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

diff --git a/ncurses/base/lib_inchstr.c b/ncurses/base/lib_inchstr.c
index 4779ae09d75bc5a0abb09490dd41b30d0ff47909..aebb6d625d5c86705bae81061865203916c3966d 100644 (file)
--- a/ncurses/base/lib_inchstr.c
+++ b/ncurses/base/lib_inchstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 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,9 +29,9 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
 /*
 **     lib_inchstr.c
 **
@@ -41,22 +41,25 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inchstr.c,v 1.7 1998/02/11 12:13:55 tom Exp $")
+MODULE_ID("$Id: lib_inchstr.c,v 1.12 2010/12/20 01:37:41 tom Exp $")
 
-int winchnstr(WINDOW *win, chtype *str, int n)
+NCURSES_EXPORT(int)
+winchnstr(WINDOW *win, chtype *str, int n)
 {
-       int     i = 0;
+    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 (!str)
+       returnCode(0);
 
-       if (win) {
-         for (; (n < 0 || (i < n)) && (win->_curx + i <= win->_maxx); i++)
-           str[i] = win->_line[win->_cury].text[win->_curx + i];
-       }
-       str[i] = (chtype)0;
+    if (win) {
+       for (; (n < 0 || (i < n)) && (win->_curx + i <= win->_maxx); i++)
+           str[i] =
+               (chtype) CharOf(win->_line[win->_cury].text[win->_curx + i]) |
+               AttrOf(win->_line[win->_cury].text[win->_curx + i]);
+    }
+    str[i] = (chtype) 0;
 
-       returnCode(i);
+    returnCode(i);
 }