386BSD 0.1 development

[unix-history] / usr / src / lib / libcurses / scanw.c

diff --git a/usr/src/lib/libcurses/scanw.c b/usr/src/lib/libcurses/scanw.c
index b14aeda..470b9bd 100644 (file)
--- a/usr/src/lib/libcurses/scanw.c
+++ b/usr/src/lib/libcurses/scanw.c
@@ -2,16 +2,37 @@
  * Copyright (c) 1981 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1981 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)scanw.c    5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)scanw.c    5.7 (Berkeley) 4/15/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -19,48 +40,76 @@ static char sccsid[] = "@(#)scanw.c 5.2 (Berkeley) %G%";
  *
  */
 
  *
  */
 

-# include      "curses.ext"
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include "curses.ext"

 
 /*
  *     This routine implements a scanf on the standard screen.
  */
 
 /*
  *     This routine implements a scanf on the standard screen.
  */

-scanw(fmt, args)
-char   *fmt;
-int    args; {
+#if __STDC__
+scanw(const char *fmt, ...)
+#else
+scanw(fmt, va_alist)
+       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 = _sscans(stdscr, fmt, ap);
+       va_end(ap);
+       return ret;

 }
 }

+

 /*
  *     This routine implements a scanf on the given window.
  */
 /*
  *     This routine implements a scanf on the given window.
  */

-wscanw(win, fmt, args)
-WINDOW *win;
-char   *fmt;
-int    args; {
+#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(win, fmt, &args);
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       ret = _sscans(win, fmt, ap);
+       va_end(ap);
+       return ret;

 }
 }

+

 /*
  *     This routine actually executes the scanf from the window.
 /*
  *     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.
+ *     THIS SHOULD BE RENAMED vwscanw AND EXPORTED

  */
  */

-_sscans(win, fmt, args)
-WINDOW *win;
-char   *fmt;
-int    *args; {
-
-       char    buf[100];
-       FILE    junk;
+_sscans(win, fmt, ap)
+       WINDOW *win;
+#if __STDC__
+       const char *fmt;
+#else
+       char *fmt;
+#endif
+       va_list ap;
+{
+       char buf[100];

 
 

-       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;

 }
 }