ncurses 5.3

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index b3e1d030a4b64eb11f4e4ce63799c71789a4b029..157d2ec9b4f7266c127c274cc5840eda13730e5d 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2001,2002 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            *
@@ -31,7 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
 /*
 **     lib_instr.c
 **
@@ -41,33 +40,34 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.8 1998/02/11 12:13:54 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.12 2002/10/05 23:23:05 tom Exp $")
 
-int winnstr(WINDOW *win, char *str, int n)
+NCURSES_EXPORT(int)
+winnstr(WINDOW *win, char *str, int n)
 {
-       int     i=0, row, col;
+    int i = 0, row, col;
+
+    T((T_CALLED("winnstr(%p,%p,%d)"), win, str, n));
 
-       T((T_CALLED("winnstr(%p,%p,%d)"), win, str, n));
+    if (!str)
+       returnCode(0);
 
-       if (!str)
-         returnCode(0);
-       
-       if (win) {
-         getyx(win, row, col);
+    if (win) {
+       getyx(win, row, col);
 
-         if (n < 0)
+       if (n < 0)
            n = win->_maxx - win->_curx + 1;
 
-         for (; i < n;) {
-           str[i++] = TextOf(win->_line[row].text[col]);
+       for (; i < n;) {
+           str[i++] = CharOf(win->_line[row].text[col]);
            if (++col > win->_maxx) {
-             col = 0;
-             if (++row > win->_maxy)
-               break;
+               col = 0;
+               if (++row > win->_maxy)
+                   break;
            }
-         }
        }
-       str[i] = '\0';  /* SVr4 does not seem to count the null */
-       returnCode(i);
+    }
+    str[i] = '\0';             /* SVr4 does not seem to count the null */
+    T(("winnstr returns %s", _nc_visbuf(str)));
+    returnCode(i);
 }
-