 @@ -1,237 +1,235 @@
-/*	$NetBSD: main.c,v 1.29 2009/07/20 06:43:18 dholland Exp $	*/
+/*	$NetBSD: main.c,v 1.30 2009/08/05 04:03:47 dholland Exp $	*/
 /*
  * 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. 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.29 2009/07/20 06:43:18 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.30 2009/08/05 04:03:47 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <ctype.h>
 #include <curses.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include "robots.h"
 extern const char *Scorefile;
 extern int Max_per_uid;
 int
-main(int ac, char **av)
+main(int argc, char **argv)
+{
-	const char *sp;
+	const char *word;
 	bool bad_arg;
 	bool show_only;
 	int score_wfd; /* high score writable file descriptor */
 	int score_err = 0; /* hold errno from score file open */
 	int maximum = 0;
 	char ch;
 	int i;
 	score_wfd = open(Scorefile, O_RDWR);
 	if (score_wfd < 0)
 		score_err = errno;
 	else if (score_wfd < 3)
 		exit(1);
 	/* Revoke setgid privileges */
 	setgid(getgid());
 	show_only = false;
 	Num_games = 1;
 	if (ac > 1) {
-		bad_arg = false;
+	while ((ch = getopt(argc, argv, "Aajnrst")) != -1) {
-		for (++av; ac > 1 && *av[0]; av++, ac--)
+		switch (ch) {
-			if (av[0][0] != '-')
+		    case 'A':
-				if (isdigit((unsigned char)av[0][0]))
+			Auto_bot = true;
-					Max_per_uid = atoi(av[0]);
+			break;
-				else {
+		    case 'a':
-					Scorefile = av[0];
+			Start_level = 4;
-					if (score_wfd >= 0)
+			break;
-						close(score_wfd);
+		    case 'j':
-					score_wfd = open(Scorefile, O_RDWR);
+			Jump = true;
-					if (score_wfd < 0)
+			break;
-						score_err = errno;
+		    case 'n':
 			Num_games++;
 			break;
 		    case 'r':
 			Real_time = true;
 			break;
 		    case 's':
 			show_only = true;
 			break;
 		    case 't':
 			Teleport = true;
 			break;
 		    default:
 			errx(1,
 			    "Usage: robots [-Aajnrst] [maximum] [scorefile]");
 			break;
+		}
+	}
 	for (i = optind; i < argc; i++) {
 		word = argv[i];
 		if (isdigit((unsigned char)word[0])) {
 			maximum = atoi(word);
 		} else {
 			Scorefile = word;
 			Max_per_uid = maximum;
 			if (score_wfd >= 0)
 				close(score_wfd);
 			score_wfd = open(Scorefile, O_RDWR);
 			if (score_wfd < 0)
 				score_err = errno;
 #ifdef FANCY
-					sp = strrchr(Scorefile, '/');
+			word = strrchr(Scorefile, '/');
-					if (sp == NULL)
+			if (word == NULL)
-						sp = Scorefile;
+				word = Scorefile;
-					if (strcmp(sp, "pattern_roll") == 0)
+			if (strcmp(word, "pattern_roll") == 0)
-						Pattern_roll = true;
+				Pattern_roll = true;
-					else if (strcmp(sp, "stand_still") == 0)
+			else if (strcmp(word, "stand_still") == 0)
-						Stand_still = true;
+				Stand_still = true;
-					if (Pattern_roll || Stand_still)
+			if (Pattern_roll || Stand_still)
-						Teleport = true;
+				Teleport = true;
 #endif
 			else
 				for (sp = &av[0][1]; *sp; sp++)
 					switch (*sp) {
 					  case 'A':
 						Auto_bot = true;
 						break;
 					  case 's':
 						show_only = true;
 						break;
 					  case 'r':
 						Real_time = true;
 						break;
 					  case 'a':
 						Start_level = 4;
 						break;
 					  case 'n':
 						Num_games++;
 						break;
 					  case 'j':
 						Jump = true;
 						break;
 					  case 't':
 						Teleport = true;
 						break;
 					  default:
 						fprintf(stderr, "robots: unknown option: %c\n", *sp);
 						bad_arg = true;
 						break;
 		if (bad_arg) {
 			exit(1);
 			/* NOTREACHED */
+		}
+	}
 	if (show_only) {
 		show_score();
 		exit(0);
 		/* NOTREACHED */
+	}
 	if (score_wfd < 0) {
 		errno = score_err;
 		warn("%s", Scorefile);
 		warnx("High scores will not be recorded!");
 		sleep(2);
+	}
 	if (!initscr())
 		errx(0, "couldn't initialize screen");
 	signal(SIGINT, quit);
 	cbreak();
 	noecho();
 	nonl();
 	if (LINES != Y_SIZE || COLS != X_SIZE) {
 		if (LINES < Y_SIZE || COLS < X_SIZE) {
 			endwin();
 			printf("Need at least a %dx%d screen\n",
 			    Y_SIZE, X_SIZE);
 			exit(1);
+		}
 		delwin(stdscr);
 		stdscr = newwin(Y_SIZE, X_SIZE, 0, 0);
+	}
 	srandom(time(NULL));
 	if (Real_time)
 		signal(SIGALRM, move_robots);
 	do {
 		while (Num_games--) {
 			init_field();
 			for (Level = Start_level; !Dead; Level++) {
 				make_level();
 				play_level();
 				if (Auto_bot)
 					sleep(1);
+			}
 			move(My_pos.y, My_pos.x);
 			printw("AARRrrgghhhh....");
 			refresh();
 			if (Auto_bot)
 				sleep(1);
 			score(score_wfd);
 			if (Auto_bot)
 				sleep(1);
 			refresh();
+		}
 		Num_games = 1;
 	} while (!Auto_bot && another());
 	quit(0);
 	/* NOTREACHED */
 	return(0);
+}
 /*
  * quit:
  *	Leave the program elegantly.
  */
 void
 quit(int dummy __unused)
+{
 	endwin();
 	exit(0);
 	/* NOTREACHED */
+}
 /*
  * another:
  *	See if another game is desired
  */
 bool
 another(void)
+{
 	int y;
 #ifdef FANCY
 	if ((Stand_still || Pattern_roll) && !Newscore)
 		return true;
 #endif
 	if (query("Another game?")) {
 		if (Full_clear) {
 			for (y = 1; y <= Num_scores; y++) {
 				move(y, 1);
 				clrtoeol();
+			}
 			refresh();
+		}
 		return true;
+	}
 	return false;
+}

 @@ -1,156 +1,169 @@
-.\"	$NetBSD: robots.6,v 1.14 2009/04/09 03:52:54 joerg Exp $
+.\"	$NetBSD: robots.6,v 1.15 2009/08/05 04:03:47 dholland Exp $
 .\"
 .\" Copyright (c) 1991, 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. 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.
 .\"
 .\"	@(#)robots.6	8.1 (Berkeley) 5/31/93
 .\"
-.Dd May 31, 1993
+.Dd August 4, 2009
 .Dt ROBOTS 6
 .Os
 .Sh NAME
 .Nm robots
 .Nd fight off villainous robots
 .Sh SYNOPSIS
 .Nm
-.Op Fl Asjtan
+.Op Fl Aajnrst
 .Op Ar maximum
 .Op Ar scorefile
 .Sh DESCRIPTION
 .Nm
 pits you against evil robots, who are trying to kill you (which is why
 they are evil).
 Fortunately for you, even though they are evil, they are not very bright
 and have a habit of bumping into each other, thus destroying themselves.
 In order to survive, you must get them to kill each other off, since you
 have no offensive weaponry.
 .Pp
 Since you are stuck without offensive weaponry, you are endowed with one
 piece of defensive weaponry: a teleportation device.
 When two robots run into each other or a junk pile, they die.
 If a robot runs into you, you die.
 When a robot dies, you get 10 points, and when all the robots die,
 you start on the next field.
 This keeps up until they finally get you.
 .Pp
 Robots are represented on the screen by a
 .Sq \&+ ,
 the junk heaps from their collisions by a
 .Sq \(** ,
 and you
 (the good guy)
 by a
 .Sq @ .
 .Pp
 The commands are:
 .Bl -tag -width indent -compact
 .It Ic h
 move one square left
 .It Ic l
 move one square right
 .It Ic k
 move one square up
 .It Ic j
 move one square down
 .It Ic y
 move one square up and left
 .It Ic u
 move one square up and right
 .It Ic b
 move one square down and left
 .It Ic n
 move one square down and right
 .It Ic \&.
 (also space) do nothing for one turn
 .It Ic HJKLBNYU
 run as far as possible in the given direction
 .It Ic \*[Gt]
 do nothing for as long as possible
 .It Ic t
 teleport to a random location
 .It Ic w
 wait until you die or they all do
 .It Ic q
 quit
 .It Ic ^L
 redraw the screen
 .El
 .Pp
 All commands can be preceded by a count.
 .Pp
 If you use the
 .Sq Ic w
 command and survive to the next level, you will get a bonus of 10%
 for each robot which died after you decided to wait.
 If you die, however, you get nothing.
 For all other commands, the program will save you from typos
 by stopping short of being eaten.
 However, with
 .Sq Ic w
 you take the risk of dying by miscalculation.
 .Pp
 Only five scores are allowed per user on the score file.
 If you make it into the score file, you will be shown the list at the end
 of the game.
-If an alternative score file is specified, that will be used instead of the
+If an alternative score file is named on the command line, that file
-standard file for scores.
+will be used instead of the standard file for scores.
 The score file must be created empty beforehand, e.g. with
 .Xr touch 1 .
 If the argument
 .Ar maximum ,
 which must be a number, is provided when a score file is first used,
 the value given will be used as the maximum number of scores to keep
 per user instead of the default five.
 This value is a property of the score file and cannot be changed later.
 .Pp
 The options are
 .Bl -tag -width indent
-.It Fl s
+.It Fl A
-Don't play, just show the score file.
+Auto-bot mode.
 Lets the game play itself.
 .It Fl a
 Advance into the higher levels directly, skipping the lower, easier levels.
 .It Fl j
 Jump,
 .Em i.e. ,
 when you run, don't show any intermediate positions; only show things at
 the end.
 This is useful on slow terminals.
 .It Fl n
 Increase the number of games played by one; that is, automatically
 choose to play again one time per usage of this option.
 .It Fl r
 Play in real time; that is, if you do nothing for a few seconds the
 game will assume you meant to do nothing and move the robots.
 .It Fl s
 Don't play, just show the score file.
 .It Fl t
 Teleport automatically when you have no other option.
 This is a little disconcerting until you get used to it, and then it is
 very nice.
 .It Fl a
 Advance into the higher levels directly, skipping the lower, easier levels.
 .It Fl A
 Auto-bot mode.
 Lets the game play itself.
 .It Fl n
 Increase the number of games played by one.
 .El
 .Sh FILES
 .Bl -tag -width /var/games/robots_roll -compact
 .It Pa /var/games/robots_roll
-the score file
+The score file.
 .El
 .Sh AUTHORS
 .An Ken Arnold
 .An Christos Zoulas
 (autobot mode)
 .Sh BUGS
 Bugs?
 You
 .Em crazy ,
 man?!?