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 4c9d6b2..470b9bd 100644 (file)
--- a/usr/src/lib/libcurses/scanw.c
+++ b/usr/src/lib/libcurses/scanw.c
@@ -2,11 +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.
  *

- * %sccs.include.redist.c%
+ * 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.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)scanw.c    5.7 (Berkeley) 4/15/91";

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


@@ -14,75 +40,76 @@ static char sccsid[] = "@(#)scanw.c 5.5 (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; {
-
-       return _sscans(win, fmt, &args);
-}
-
-/*
- *     Internal routine to read from a string, and its data structure.
- */
-struct strinfo {
-       char    *addr;          /* address */
-       int     len;            /* remaining bytes */
-};
-
-static int
-_winread(cookie, buf, n)
-char   *cookie, *buf;
-reg int        n; {
-
-       reg struct strinfo *s = (struct strinfo *)cookie;
+#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;

 
 

-       if (n > s->len)
-               n = s->len;
-       bcopy(s->addr, buf, n);
-       s->len -= n;
-       s->addr += n;
-       return n;
+#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.

- *     SHOULD IMPLEMENT VSSCANF
+ *     THIS SHOULD BE RENAMED vwscanw AND EXPORTED

  */
  */

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

 
 

-       if ((f = fropen((char *)&s, _winread)) == NULL)
-               return ERR;
-       if (wgetstr(win, buf) == ERR) {
-               (void) fclose(f);
-               return ERR;
-       }
-       s.addr = buf;
-       s.len = strlen(buf);
-       ret = __svfscanf(f, fmt, args);
-       (void) fclose(f);
-       return ret;
+       return wgetstr(win, buf) == OK ? vsscanf(buf, fmt, ap) : ERR;

 }
 }