BSD 4_3_Reno release

[unix-history] / usr / src / games / sail / misc.c

diff --git a/usr/src/games/sail/misc.c b/usr/src/games/sail/misc.c
index 7197c2f..da6ac6d 100644 (file)
--- a/usr/src/games/sail/misc.c
+++ b/usr/src/games/sail/misc.c
@@ -3,23 +3,26 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * 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
+ * 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
  * 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.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)misc.c     5.3 (Berkeley) 6/18/88";
+static char sccsid[] = "@(#)misc.c     5.5 (Berkeley) 6/1/90";

 #endif /* not lint */
 
 #include "externs.h"
 #endif /* not lint */
 
 #include "externs.h"

+#include "pathnames.h"

 
 #define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
 
 
 #define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
 


@@ -176,7 +179,7 @@ register struct ship *s;
        float net;
        register struct logs *lp;
 
        float net;
        register struct logs *lp;
 

-       if ((fp = fopen(LOGFILE, "r+")) == NULL)
+       if ((fp = fopen(_PATH_LOGFILE, "r+")) == NULL)

                return;
 #ifdef LOCK_EX
        if (flock(fileno(fp), LOCK_EX) < 0)
                return;
 #ifdef LOCK_EX
        if (flock(fileno(fp), LOCK_EX) < 0)