diff options
| author |   millert <millert@openbsd.org> | 1997-12-03 05:20:47 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1997-12-03 05:20:47 +0000 |
| commit | 6f4099fecac342eeff29dd2bf0512f777a62a591 (patch) | |
| tree | 30035276ed4d5b07245464d724dd101dc9b5efb4 /lib/libcurses/lib_inchstr.c | |
| parent | merge of ncurses-4.1-971129 (diff) | |
| download | wireguard-openbsd-6f4099fecac342eeff29dd2bf0512f777a62a591.tar.xz wireguard-openbsd-6f4099fecac342eeff29dd2bf0512f777a62a591.zip | |
Merge of ncurses-4.1-971129
Diffstat (limited to 'lib/libcurses/lib_inchstr.c')
| -rw-r--r-- | lib/libcurses/lib_inchstr.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libcurses/lib_inchstr.c b/lib/libcurses/lib_inchstr.c index 8ed9a8725cb..7c40224f9c4 100644 --- a/lib/libcurses/lib_inchstr.c +++ b/lib/libcurses/lib_inchstr.c @@ -1,3 +1,5 @@ +/* $OpenBSD: lib_inchstr.c,v 1.3 1997/12/03 05:21:19 millert Exp $ */ + /*************************************************************************** * COPYRIGHT NOTICE * @@ -29,16 +31,21 @@ #include <curses.priv.h> -MODULE_ID("Id: lib_inchstr.c,v 1.5 1997/02/02 01:06:03 tom Exp $") +MODULE_ID("Id: lib_inchstr.c,v 1.6 1997/09/20 15:02:34 juergen Exp $") int winchnstr(WINDOW *win, chtype *str, int n) { - int i; + int i = 0; T((T_CALLED("winchnstr(%p,%p,%d)"), win, str, n)); - for (i = 0; (n < 0 || (i < n)) && (win->_curx + i <= win->_maxx); i++) + 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; returnCode(i); |