X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1c15e88899094343f75aeba04122cd96a96b428e..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/lib/libcurses/scanw.c diff --git a/usr/src/lib/libcurses/scanw.c b/usr/src/lib/libcurses/scanw.c index 14b9affc17..b46811fceb 100644 --- a/usr/src/lib/libcurses/scanw.c +++ b/usr/src/lib/libcurses/scanw.c @@ -1,73 +1,175 @@ /* - * Copyright (c) 1981 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1981, 1993 + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that: (1) source distributions retain this entire copyright - * notice and comment, and (2) distributions including binaries display - * the following acknowledgement: ``This product includes software - * developed by the University of California, Berkeley and its contributors'' - * in the documentation or other materials provided with the distribution - * and in all advertising materials mentioning features or use of this - * software. Neither the name of the University nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #ifndef lint -static char sccsid[] = "@(#)scanw.c 5.4 (Berkeley) 6/1/90"; -#endif /* not lint */ +static char sccsid[] = "@(#)scanw.c 8.1 (Berkeley) 6/4/93"; +#endif /* not lint */ /* - * scanw and friends - * + * scanw and friends. + */ + +#include + +#if __STDC__ +#include +#else +#include +#endif + +/* + * scanw -- + * Implement a scanf on the standard screen. */ +int +#if __STDC__ +scanw(const char *fmt, ...) +#else +scanw(fmt, va_alist) + char *fmt; + va_dcl +#endif +{ + va_list ap; + int ret; -# include "curses.ext" +#if __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + ret = vwscanw(stdscr, fmt, ap); + va_end(ap); + return (ret); +} /* - * This routine implements a scanf on the standard screen. + * wscanw -- + * Implements a scanf on the given window. */ -scanw(fmt, args) -char *fmt; -int args; { +int +#if __STDC__ +wscanw(WINDOW *win, const char *fmt, ...) +#else +wscanw(win, fmt, va_alist) + WINDOW *win; + char *fmt; + va_dcl +#endif +{ + va_list ap; + int ret; - return _sscans(stdscr, fmt, &args); +#if __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + ret = vwscanw(win, fmt, ap); + va_end(ap); + return (ret); } + /* - * This routine implements a scanf on the given window. + * mvscanw, mvwscanw -- + * Implement the mvscanw commands. Due to the variable number of + * arguments, they cannot be macros. Another sigh.... */ -wscanw(win, fmt, args) -WINDOW *win; -char *fmt; -int args; { +int +#if __STDC__ +mvscanw(register int y, register int x, const char *fmt,...) +#else +mvscanw(y, x, fmt, va_alist) + register int y, x; + char *fmt; + va_dcl +#endif +{ + va_list ap; + int ret; - return _sscans(win, fmt, &args); + if (move(y, x) != OK) + return (ERR); +#if __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + ret = vwscanw(stdscr, fmt, ap); + va_end(ap); + return (ret); } + +int +#if __STDC__ +mvwscanw(register WINDOW * win, register int y, register int x, + const char *fmt, ...) +#else +mvwscanw(win, y, x, fmt, va_alist) + register WINDOW *win; + register int y, x; + char *fmt; + va_dcl +#endif +{ + va_list ap; + int ret; + + if (move(y, x) != OK) + return (ERR); +#if __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + ret = vwscanw(win, fmt, ap); + va_end(ap); + return (ret); +} + /* + * vwscanw -- * This routine actually executes the scanf from the window. - * - * This is really a modified version of "sscanf". As such, - * it assumes that sscanf interfaces with the other scanf functions - * in a certain way. If this is not how your system works, you - * will have to modify this routine to use the interface that your - * "sscanf" uses. */ -_sscans(win, fmt, args) -WINDOW *win; -char *fmt; -int *args; { +int +vwscanw(win, fmt, ap) + WINDOW *win; + const char *fmt; + va_list ap; +{ - char buf[100]; - FILE junk; + char buf[1024]; - junk._flag = _IOREAD|_IOSTRG; - junk._base = junk._ptr = buf; - if (wgetstr(win, buf) == ERR) - return ERR; - junk._cnt = strlen(buf); - return _doscan(&junk, fmt, args); + return (wgetstr(win, buf) == OK ? + vsscanf(buf, fmt, ap) : ERR); }