change default tty_ch to 0; remove for loop which purported to find

[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 19549c0..3419626 100644 (file)
--- a/usr/src/lib/libcurses/mvprintw.c
+++ b/usr/src/lib/libcurses/mvprintw.c
@@ -1,10 +1,30 @@
+/*
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)mvprintw.c 5.4 (Berkeley) %G%";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  * implement the mvprintw commands.  Due to the variable number of
  * arguments, they cannot be macros.  Sigh....
  *
 # include      "curses.ext"
 
 /*
  * implement the mvprintw commands.  Due to the variable number of
  * arguments, they cannot be macros.  Sigh....
  *

- * %G% (Berkeley) @(#)mvprintw.c       1.1

  */
 
 mvprintw(y, x, fmt, args)
  */
 
 mvprintw(y, x, fmt, args)


@@ -12,7 +32,12 @@ reg int              y, x;
 char           *fmt;
 int            args; {
 
 char           *fmt;
 int            args; {
 

-       return move(y, x) == OK ? _sprintw(stdscr, fmt, &args) : ERR;
+       char    buf[512];
+
+       if (move(y, x) != OK)
+               return ERR;
+       (void) vsprintf(buf, fmt, &args);
+       return waddstr(stdscr, buf);

 }
 
 mvwprintw(win, y, x, fmt, args)
 }
 
 mvwprintw(win, y, x, fmt, args)


@@ -21,5 +46,10 @@ reg int              y, x;
 char           *fmt;
 int            args; {
 
 char           *fmt;
 int            args; {
 

-       return wmove(win, y, x) == OK ? _sprintw(win, fmt, &args) : ERR;
+       char    buf[512];
+
+       if (move(y, x) != OK)
+               return ERR;
+       (void) vsprintf(buf, fmt, &args);
+       return waddstr(win, buf);

 }
 }