Index: Makefile
===================================================================
RCS file: /cvsroot/basesrc/lib/libcurses/Makefile,v
retrieving revision 1.30
diff -d -p -u -r1.30 Makefile
--- Makefile	2000/08/13 03:20:07	1.30
+++ Makefile	2000/11/28 13:51:40
@@ -18,6 +18,76 @@ SRCS=	addbytes.c addch.c addnstr.c acs.c
         putchar.c refresh.c scanw.c scroll.c scrollok.c setterm.c standout.c \
         timeout.c toucholap.c touchwin.c tscroll.c tstp.c tty.c unctrl.c \
         underscore.c
+
+SRCS= \
+acs.c \
+addbytes.c \
+addch.c \
+addnstr.c \
+attributes.c \
+background.c \
+bell.c \
+border.c \
+box.c \
+clear.c \
+clearok.c \
+clrtobot.c \
+clrtoeol.c \
+color.c \
+copywin.c \
+cr_put.c \
+ctrace.c \
+cur_hash.c \
+curs_set.c \
+curses.c \
+delch.c \
+deleteln.c \
+delwin.c \
+erase.c \
+flushok.c \
+fullname.c \
+getch.c \
+getstr.c \
+getyx.c \
+id_subwins.c \
+idlok.c \
+inch.c \
+inchstr.c \
+initscr.c \
+insch.c \
+insdelln.c \
+insertln.c \
+instr.c \
+keypad.c \
+leaveok.c \
+line.c \
+longname.c \
+meta.c \
+move.c \
+mvwin.c \
+newwin.c \
+nodelay.c \
+notimeout.c \
+overlay.c \
+overwrite.c \
+pause.c \
+printw.c \
+putchar.c \
+refresh.c \
+scanw.c \
+scroll.c \
+scrollok.c \
+setterm.c \
+standout.c \
+timeout.c \
+toucholap.c \
+touchwin.c \
+tscroll.c \
+tstp.c \
+tty.c \
+unctrl.c \
+underscore.c
+
 MAN=	curses.3
 INCS=	curses.h unctrl.h
 INCSDIR=/usr/include
Index: curses.h
===================================================================
RCS file: /cvsroot/basesrc/lib/libcurses/curses.h,v
retrieving revision 1.48
diff -d -p -u -r1.48 curses.h
--- curses.h	2000/05/11 22:50:23	1.48
+++ curses.h	2000/11/28 13:53:13
@@ -370,9 +370,12 @@ extern char	*ttytype;		/* Full name of c
 #define	getch()				wgetch(stdscr)
 #define	getstr(s)			wgetstr(stdscr, s)
 #define	inch()				winch(stdscr)
+#define	inchstr(c)			winchstr(stdscr, c)
+#define	innstr(s, n)			winnstr(stdscr, s, n)
 #define	insch(ch)			winsch(stdscr, ch)
 #define	insdelln(n)			winsdelln(stdscr, n)
 #define	insertln()			winsertln(stdscr)
+#define	instr(s)			winstr(stdscr, s)
 #define	move(y, x)			wmove(stdscr, y, x)
 #define	refresh()			wrefresh(stdscr)
 #define	scrl(n)				wscrl(stdscr, n)
@@ -396,7 +399,11 @@ extern char	*ttytype;		/* Full name of c
 #define	mvgetch(y, x)			mvwgetch(stdscr, y, x)
 #define	mvgetstr(y, x, s)		mvwgetstr(stdscr, y, x, s)
 #define	mvinch(y, x)			mvwinch(stdscr, y, x)
+#define	mvinchnstr(y, x, c, n)		mvwinchnstr(stdscr, y, x, c, n)
+#define	mvinchstr(y, x, c)		mvwinchstr(stdscr, y, x, c)
+#define	mvinnstr(y, x, s, n)		mvwinnstr(stdscr, y, x, s, n)
 #define	mvinsch(y, x, c)		mvwinsch(stdscr, y, x, c)
+#define	mvinstr(y, x, s)		mvwinstr(stdscr, y, x, s)
 #define	mvwaddbytes(w, y, x, s, n) \
 	(wmove(w, y, x) == ERR ? ERR : __waddbytes(w, s, n, 0))
 #define	mvwaddch(w, y, x, ch) \
@@ -413,8 +420,16 @@ extern char	*ttytype;		/* Full name of c
 	(wmove(w, y, x) == ERR ? ERR : wgetstr(w, s))
 #define	mvwinch(w, y, x) \
 	(wmove(w, y, x) == ERR ? ERR : winch(w))
+#define	mvwinchnstr(w, y, x, c, n) \
+	(wmove(w, y, x) == ERR ? ERR : winchnstr(w, c, n))
+#define	mvwinchstr(w, y, x, s) \
+	(wmove(w, y, x) == ERR ? ERR : winchstr(w, c))
+#define	mvwinnstr(w, y, x, s, n) \
+	(wmove(w, y, x) == ERR ? ERR : winnstr(w, s, n))
 #define	mvwinsch(w, y, x, c) \
 	(wmove(w, y, x) == ERR ? ERR : winsch(w, c))
+#define	mvwinstr(w, y, x, s) \
+	(wmove(w, y, x) == ERR ? ERR : winstr(w, s))
 
 #define	getyx(w, y, x)		(y) = getcury(w), (x) = getcurx(w)
 #define getbegyx(w, y, x)	(y) = getbegy(w), (x) = getbegx(w)
@@ -440,9 +455,13 @@ int	 erase(void);
 int	 getch(void);
 int	 getstr(char *);
 chtype	 inch(void);
+int	 inchnstr(chtype *, int);
+int	 inchstr(chtype *);
+int	 innstr(char *, int);
 int	 insch(chtype);
 int	 insdelln(int);
 int	 insertln(void);
+int	 instr(char *);
 int	 move(int, int);
 int	 refresh(void);
 int	 scrl(int);
@@ -466,7 +485,11 @@ int	 mvdelch(int, int);
 int	 mvgetch(int, int);
 int	 mvgetstr(int, int, char *);
 chtype	 mvinch(int, int);
+int	 mvinchnstr(int, int, chtype *, int);
+int	 mvinchstr(int, int, chtype *);
+int	 mvinnstr(int, int, char *, int);
 int	 mvinsch(int, int, chtype);
+int	 mvinstr(int, int, char *);
 
 int	 mvwaddbytes(WINDOW *, int, int, const char *, int);
 int	 mvwaddch(WINDOW *, int, int, chtype);
@@ -543,6 +566,10 @@ int	 mvvline(int, int, chtype, int);
 int	 mvwhline(WINDOW *, int, int, chtype, int);
 int	 mvwvline(WINDOW *, int, int, chtype, int);
 int	 mvwin(WINDOW *, int, int);
+int	 mvwinchnstr(WINDOW *, int, int, chtype *, int);
+int	 mvwinchstr(WINDOW *, int, int, chtype *);
+int	 mvwinnstr(WINDOW *, int, int, char *, int);
+int	 mvwinstr(WINDOW *, int, int, char *);
 int	 mvwprintw(WINDOW *, int, int, const char *, ...)
 		__attribute__((__format__(__printf__, 4, 5)));
 int	 mvwscanw(WINDOW *, int, int, const char *, ...)
@@ -602,9 +629,13 @@ int	 wgetch(WINDOW *);
 int	 wgetstr(WINDOW *, char *);
 int	 whline(WINDOW *, chtype, int);
 chtype	 winch(WINDOW *);
+int	 winchnstr(WINDOW *, chtype *, int);
+int	 winchstr(WINDOW *, chtype *);
+int	 winnstr(WINDOW *, char *, int);
 int	 winsch(WINDOW *, chtype);
 int	 winsdelln(WINDOW *, int);
 int	 winsertln(WINDOW *);
+int	 winstr(WINDOW *, char *);
 int	 wmove(WINDOW *, int, int);
 int	 wnoutrefresh(WINDOW *);
 int	 wprintw(WINDOW *, const char *, ...)
