BSD 4_3_Net_2 release

[unix-history] / usr / src / games / cribbage / io.c

diff --git a/usr/src/games/cribbage/io.c b/usr/src/games/cribbage/io.c
index 4bb8061..ef99246 100644 (file)
--- a/usr/src/games/cribbage/io.c
+++ b/usr/src/games/cribbage/io.c
@@ -2,28 +2,43 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 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[] = "@(#)io.c       5.6 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)io.c       5.8 (Berkeley) 2/28/91";

 #endif /* not lint */
 
 # include      <curses.h>
 # include      <ctype.h>
 # include      <signal.h>
 #endif /* not lint */
 
 # include      <curses.h>
 # include      <ctype.h>
 # include      <signal.h>

+# include      <stdarg.h>

 # include      "deck.h"
 # include      "cribbage.h"
 # include      "cribcur.h"
 # include      "deck.h"
 # include      "cribbage.h"
 # include      "cribcur.h"


@@ -359,12 +374,15 @@ int               Mpos = 0;
 static int     Newpos = 0;
 
 /* VARARGS1 */
 static int     Newpos = 0;
 
 /* VARARGS1 */

-msg(fmt, args)
-char   *fmt;
-int    args;
+msg(fmt)
+       char *fmt;

 {
 {

-    doadd(fmt, &args);
-    endmsg();
+       va_list ap;
+
+       va_start(ap, fmt);
+       (void)vsprintf(&Msgbuf[Newpos], fmt, ap);
+       va_end(ap);
+       endmsg();

 }
 
 /*
 }
 
 /*


@@ -372,11 +390,14 @@ int       args;
  *     Add things to the current message
  */
 /* VARARGS1 */
  *     Add things to the current message
  */
 /* VARARGS1 */

-addmsg(fmt, args)
-char   *fmt;
-int    args;
+addmsg(fmt)
+       char *fmt;

 {
 {

-    doadd(fmt, &args);
+       va_list ap;
+
+       va_start(ap, fmt);
+       (void)vsprintf(&Msgbuf[Newpos], fmt, ap);
+       va_end(ap);

 }
 
 /*
 }
 
 /*


@@ -432,6 +453,7 @@ endmsg()
     wrefresh(Msgwin);
 }
 
     wrefresh(Msgwin);
 }
 

+#ifdef notdef

 /*
  * doadd:
  *     Perform an add onto the message buffer
 /*
  * doadd:
  *     Perform an add onto the message buffer


@@ -452,6 +474,7 @@ int *args;
     putc('\0', &junk);
     Newpos = strlen(Msgbuf);
 }
     putc('\0', &junk);
     Newpos = strlen(Msgbuf);
 }

+#endif

 
 /*
  * do_wait:
 
 /*
  * do_wait: