ncurses 5.6 - patch 20080119

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index 809952fdf82fd02df86860a7b82ba2cc01c2bd2a..3fb29490ad0638f1025a6271ac22c516122cdef0 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2007 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            *
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.15 2005/11/20 01:38:03 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.16 2007/07/21 20:18:10 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
@@ -81,7 +81,7 @@ winnstr(WINDOW *win, char *str, int n)
                        n3 = wcstombs(0, wch, 0);
                        if (isEILSEQ(n3) || (n3 == 0)) {
                            ;
-                       } else if ((int) (n3 + i) >= n) {
+                       } else if ((int) (n3 + i) > n) {
                            done = TRUE;
                        } else if ((tmp = typeCalloc(char, n3 + 10)) == 0) {
                            done = TRUE;
@@ -102,9 +102,7 @@ winnstr(WINDOW *win, char *str, int n)
            str[i++] = (char) CharOf(win->_line[row].text[col]);
 #endif
            if (++col > win->_maxx) {
-               col = 0;
-               if (++row > win->_maxy)
-                   break;
+               break;
            }
        }
     }