BSD 4_4 release

[unix-history] / usr / src / lib / libc / stdio / scanf.c

diff --git a/usr/src/lib/libc/stdio/scanf.c b/usr/src/lib/libc/stdio/scanf.c
index 9f1cab6..d36b13a 100644 (file)
--- a/usr/src/lib/libc/stdio/scanf.c
+++ b/usr/src/lib/libc/stdio/scanf.c
@@ -1,33 +1,67 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scanf.c    5.2 (Berkeley) 3/9/86";
-#endif LIBC_SCCS and not lint
-
-#include       <stdio.h>
+/*-
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * 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.
+ */

 
 

-scanf(fmt, args)
-char *fmt;
-{
-       return(_doscan(stdin, fmt, &args));
-}
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)scanf.c    8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */

 
 

-fscanf(iop, fmt, args)
-FILE *iop;
-char *fmt;
-{
-       return(_doscan(iop, fmt, &args));
-}
+#include <stdio.h>
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif

 
 

-sscanf(str, fmt, args)
-register char *str;
-char *fmt;
+#if __STDC__
+scanf(char const *fmt, ...)
+#else
+scanf(fmt, va_alist)
+       char *fmt;
+       va_dcl
+#endif

 {
 {

-       FILE _strbuf;
+       int ret;
+       va_list ap;

 
 

-       _strbuf._flag = _IOREAD|_IOSTRG;
-       _strbuf._ptr = _strbuf._base = str;
-       _strbuf._cnt = 0;
-       while (*str++)
-               _strbuf._cnt++;
-       _strbuf._bufsiz = _strbuf._cnt;
-       return(_doscan(&_strbuf, fmt, &args));
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       ret = __svfscanf(stdin, fmt, ap);
+       va_end(ap);
+       return (ret);

 }
 }