BSD 4_4 release

[unix-history] / usr / src / games / trek / torped.c

diff --git a/usr/src/games/trek/torped.c b/usr/src/games/trek/torped.c
index 4aed397..e62c64b 100644 (file)
--- a/usr/src/games/trek/torped.c
+++ b/usr/src/games/trek/torped.c
@@ -1,7 +1,41 @@
+/*
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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[] = "@(#)torped.c   4.2     (Berkeley)      %G%";
-#endif not lint
+static char sccsid[] = "@(#)torped.c   8.1 (Berkeley) 5/31/93";
+#endif /* not lint */

 
 

+# include      <stdio.h>

 # include      "trek.h"
 
 /*
 # include      "trek.h"
 
 /*


@@ -64,7 +98,7 @@ torped()
                /* see if the user wants one */
                if (!testnl())
                {
                /* see if the user wants one */
                if (!testnl())
                {

-                       k = ungetc(cgetc(0), 0);
+                       k = ungetc(cgetc(0), stdin);

                        if (k >= '0' && k <= '9')
                                burst = 1;
                }
                        if (k >= '0' && k <= '9')
                                burst = 1;
                }