386BSD 0.1 development

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

diff --git a/usr/src/lib/libcurses/mvprintw.c b/usr/src/lib/libcurses/mvprintw.c
index 19d7b55..63aa58f 100644 (file)
--- a/usr/src/lib/libcurses/mvprintw.c
+++ b/usr/src/lib/libcurses/mvprintw.c
@@ -2,56 +2,96 @@
  * 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: (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
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mvprintw.c 5.5 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)mvprintw.c 5.8 (Berkeley) 6/19/91";

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

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

 
 /*
  * implement the mvprintw commands.  Due to the variable number of
  * arguments, they cannot be macros.  Sigh....
 
 /*
  * implement the mvprintw commands.  Due to the variable number of
  * arguments, they cannot be macros.  Sigh....

- *

  */
 
  */
 

-mvprintw(y, x, fmt, args)
-reg int                y, x;
-char           *fmt;
-int            args; {
-
-       char    buf[512];
+#if __STDC__
+mvprintw(reg int y, reg int x, const char *fmt, ...)
+#else
+mvprintw(y, x, fmt, va_alist)
+       reg int y, x;
+       char *fmt;
+       va_dcl
+#endif
+{
+       va_list ap;
+       int ret;

 
        if (move(y, x) != OK)
                return ERR;
 
        if (move(y, x) != OK)
                return ERR;

-       (void) vsprintf(buf, fmt, &args);
-       return waddstr(stdscr, buf);
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       ret = _sprintw(stdscr, fmt, ap);
+       va_end(ap);
+       return ret;

 }
 
 }
 

-mvwprintw(win, y, x, fmt, args)
-reg WINDOW     *win;
-reg int                y, x;
-char           *fmt;
-int            args; {
+#if __STDC__
+mvwprintw(reg WINDOW *win, reg int y, reg int x, const char *fmt, ...)
+#else
+mvwprintw(win, y, x, fmt, va_alist)
+       reg WINDOW *win;
+       reg int y, x;
+       char *fmt;
+       va_dcl
+#endif
+{
+       va_list ap;
+       int ret;

 
 

-       char    buf[512];
-
-       if (move(y, x) != OK)
+       if (wmove(win, y, x) != OK)

                return ERR;
                return ERR;

-       (void) vsprintf(buf, fmt, &args);
-       return waddstr(win, buf);
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       ret = _sprintw(win, fmt, ap);
+       va_end(ap);
+       return ret;

 }
 }