sprintf doesn't necessarily return its first arg

[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 c0a6cbe..a8c3cd7 100644 (file)
--- a/usr/src/games/sail/lo_main.c
+++ b/usr/src/games/sail/lo_main.c
@@ -1,14 +1,17 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)lo_main.c   1.3 83/07/20";
-#endif
+static char sccsid[] = "@(#)lo_main.c  5.1 (Berkeley) %G%";
+#endif not lint

 
 /*
  * Print out the top ten SAILors
  *
 
 /*
  * Print out the top ten SAILors
  *

- * sail.log [-s/l]
- *
- *  -s force a short listing (without real usernames)
- *  -l force a long listing (print out real usernames)
+ * -l force a long listing (print out real usernames)

  */
 #include <pwd.h>
 #include "externs.h"
  */
 #include <pwd.h>
 #include "externs.h"


@@ -19,27 +22,15 @@ char *title[] = {
        "Commander", "Lieutenant"
 };
 
        "Commander", "Lieutenant"
 };
 

-main(argc, argv)
-int argc;
-char **argv;
+lo_main()

 {
        FILE *fp;
        char sbuf[32];
        int n = 0, people;
 {
        FILE *fp;
        char sbuf[32];
        int n = 0, people;

-       int usrnam = 0;

        struct passwd *getpwuid(), *pass;
        struct logs log;
        struct ship *ship;
 
        struct passwd *getpwuid(), *pass;
        struct logs log;
        struct ship *ship;
 

-       if (argc > 1 && argc == 2)
-               if (strcmp(argv[1], "-s") == 0)
-                       usrnam = 0;
-               else if (strcmp(argv[1], "-l") == 0)
-                       usrnam = 1;
-               else {
-                       fprintf(stderr, "usage: %s: [-s/l]\n", argv[0]);
-                       exit(1);
-               }

        if ((fp = fopen(LOGFILE, "r")) == 0) {
                perror(LOGFILE);
                exit(1);
        if ((fp = fopen(LOGFILE, "r")) == 0) {
                perror(LOGFILE);
                exit(1);


@@ -54,9 +45,9 @@ char **argv;
                perror(LOGFILE);
                exit(1);
        }
                perror(LOGFILE);
                exit(1);
        }

-       while (fread((char *)&log, sizeof log, 1, fp) == 1
-              && log.l_name[0] != '\0') {
-               if (usrnam && (pass = getpwuid(log.l_uid)) != NULL)
+       while (fread((char *)&log, sizeof log, 1, fp) == 1 &&
+              log.l_name[0] != '\0') {
+               if (longfmt && (pass = getpwuid(log.l_uid)) != NULL)

                        (void) sprintf(sbuf, "%10.10s (%s)",
                                log.l_name, pass->pw_name);
                else
                        (void) sprintf(sbuf, "%10.10s (%s)",
                                log.l_name, pass->pw_name);
                else


@@ -67,4 +58,5 @@ char **argv;
                        (float) log.l_netpoints / ship->specs->pts);
        }
        printf("\n%d people have played.\n", people);
                        (float) log.l_netpoints / ship->specs->pts);
        }
        printf("\n%d people have played.\n", people);

+       return 0;

 }
 }