BSD 4_3_Reno release

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

diff --git a/usr/src/games/sail/lo_main.c b/usr/src/games/sail/lo_main.c
index 3e7b38f..34cdf2e 100644 (file)
--- a/usr/src/games/sail/lo_main.c
+++ b/usr/src/games/sail/lo_main.c
@@ -3,20 +3,22 @@
  * 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[] = "@(#)lo_main.c  5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)lo_main.c  5.6 (Berkeley) 6/1/90";

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


@@ -27,6 +29,7 @@ static char sccsid[] = "@(#)lo_main.c 5.4 (Berkeley) %G%";
 #include <sys/types.h>
 #include <pwd.h>
 #include "externs.h"
 #include <sys/types.h>
 #include <pwd.h>
 #include "externs.h"

+#include "pathnames.h"

 
 char *title[] = {
        "Admiral", "Commodore", "Captain", "Captain",
 
 char *title[] = {
        "Admiral", "Commodore", "Captain", "Captain",


@@ -43,8 +46,8 @@ lo_main()
        struct logs log;
        struct ship *ship;
 
        struct logs log;
        struct ship *ship;
 

-       if ((fp = fopen(LOGFILE, "r")) == 0) {
-               perror(LOGFILE);
+       if ((fp = fopen(_PATH_LOGFILE, "r")) == 0) {
+               perror(_PATH_LOGFILE);

                exit(1);
        }
        switch (fread((char *)&people, sizeof people, 1, fp)) {
                exit(1);
        }
        switch (fread((char *)&people, sizeof people, 1, fp)) {


@@ -54,7 +57,7 @@ lo_main()
        case 1:
                break;
        default:
        case 1:
                break;
        default:

-               perror(LOGFILE);
+               perror(_PATH_LOGFILE);

                exit(1);
        }
        while (fread((char *)&log, sizeof log, 1, fp) == 1 &&
                exit(1);
        }
        while (fread((char *)&log, sizeof log, 1, fp) == 1 &&