Fix Ularn to build on Mandrake Linux 10.1. This addresses PR#29450.

Changes include:
* remove lrint(), which is unused, and collides with the C99 lrint().
* remove malloc() prototypes, which are incorrect
* add include search path to CFLAGS to catch Mandrake's termcap.h
* in the case of Linux, define GETOPT, to match glibc

7 files changed, 124 insertions, 71 deletions

diff --git a/games/ularn/Makefile b/games/ularn/Makefile
index 3b4e86d1765..38817fbe572 100644
--- a/games/ularn/Makefile
+++ b/games/ularn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/15 21:17:08 ben Exp $
+# $NetBSD: Makefile,v 1.15 2005/02/28 02:26:59 ben Exp $
 
 DISTNAME=		ularn
 PKGNAME=		ularn-6.12.92
@@ -26,6 +26,10 @@ SUBST_FILES.termlib=	Configure
 SUBST_SED.termlib=	-e 's,^termlib=..termlib,& -lcompat,'
 .endif
 
+.if ${OPSYS} == "Linux"
+CFLAGS+=		-I/usr/include/ncurses -DGETOPT
+.endif
+
 pre-configure:
 	${MV} ${WRKSRC}/Configure ${WRKSRC}/Configure.template
 	${SED} 's:XXXLIBDIRXXX:${LOCALBASE}/share/Ularn:;\
diff --git a/games/ularn/distinfo b/games/ularn/distinfo
index 2af13e13c29..613ec5496d5 100644
--- a/games/ularn/distinfo
+++ b/games/ularn/distinfo
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/02/28 02:26:59 ben Exp $
 
 SHA1 (ularn.tar.gz) = abc5bbecca65968e9ddaf2a8d07ac5141009459d
 RMD160 (ularn.tar.gz) = 8560ec0f0fe0f800a4ca05f44ae6868164652251
 Size (ularn.tar.gz) = 142790 bytes
-SHA1 (patch-aa) = 1ce8bbbc05f275a832814b08c38bc6df066fe7b0
+SHA1 (patch-aa) = ea20234faaf6699429d1f25734df820d233f34f7
 SHA1 (patch-ab) = a45fec8456da7b2b1985dc2332ede80082b2dab4
 SHA1 (patch-ac) = 859fb4ae3782658d2f2cf29d11da67a901499e61
 SHA1 (patch-ad) = ecf9b099ac8df2b86a9c45c0cf76c7caf194f64b
 SHA1 (patch-ae) = a6a68608da9daf237701ea18c2462e2de6c29413
 SHA1 (patch-af) = 252c2f2d318189efc9ab5d2ec78ff78c3d54fb68
 SHA1 (patch-ag) = 85dd443611465ddb3fc9819e8d69dd6028fa6fe7
-SHA1 (patch-ah) = b56861b88f5abd7da2e2b0f5de4dc1f7261ff235
-SHA1 (patch-ai) = 43b9a2fb45a2a52347f0a83efca5ba70c3c58989
+SHA1 (patch-ah) = f517cd95a7d8e2073a95fcdbc808fdd1a68f41bb
+SHA1 (patch-ai) = f48854df867e3aa1e700d110382657aa2e234dda
 SHA1 (patch-aj) = 09b5d87673103739c6bf7dfbf44c6fb8808fbd28
 SHA1 (patch-ak) = d2cb3bda3c2e95868362a0d0dcf4bb584d6df987
-SHA1 (patch-al) = 051ac587d3181df8a1161fd45cbd7eff4877e2e0
+SHA1 (patch-al) = f4896ea05a19b57df55b975aecbe909d104c0ccc
 SHA1 (patch-am) = 1df190db775f3d2278275894f18246e4897738e0
-SHA1 (patch-an) = 8c669a56795a8b4a2a6e24fd2fb121aa0699c01a
+SHA1 (patch-an) = d92c9a2bd23303efabef2ac07b4c74c18eed3a10
 SHA1 (patch-ao) = 42a184fea3408fc935f3dcc62b7a127e81b71085
 SHA1 (patch-ap) = a46a3b27d2f5ac9e4479ac77bf193636608b42a4
 SHA1 (patch-aq) = e5b1e4a63d242316d9db3184b4f3e5ab62b4271c
diff --git a/games/ularn/patches/patch-aa b/games/ularn/patches/patch-aa
index 964e7b29019..73a19a45614 100644
--- a/games/ularn/patches/patch-aa
+++ b/games/ularn/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/04/15 21:17:08 ben Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/28 02:26:59 ben Exp $
 
 --- Configure.orig	2004-04-15 13:55:44.000000000 -0700
 +++ Configure
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/15 21:17:08 ben Exp $
  large=''
  huge=''
 -ccflags=''
-+ccflags='-g -Wall -Wno-comment'
++ccflags="$CFLAGS -g -Wall -Wno-comment"
  ldflags=''
  cc=''
  n=''
diff --git a/games/ularn/patches/patch-ah b/games/ularn/patches/patch-ah
index c13aa059193..d1f81995cc0 100644
--- a/games/ularn/patches/patch-ah
+++ b/games/ularn/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
+$NetBSD: patch-ah,v 1.3 2005/02/28 02:26:59 ben Exp $
 
 --- extern.h.orig	1992-06-19 13:55:30.000000000 -0700
 +++ extern.h
@@ -115,7 +115,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  
  /* module: fortune.c */
  
-@@ -78,178 +78,178 @@ char *fortune(char *);
+@@ -78,178 +78,177 @@ char *fortune(char *);
  
  /* module: help.c */
  
@@ -140,7 +140,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
 +void lprint(long);
 +void lwrite(char *, int);
  long lgetc1(void);
- long lrint(void);
+-long lrint(void);
 -int lrfill(char *, int);
 +void lrfill(char *, int);
  char *lgetw(void);
@@ -403,7 +403,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  unsigned int sum(unsigned char *, int);
  
  /* module: scores.c */
-@@ -261,112 +261,112 @@ int hashewon(void);
+@@ -261,112 +260,112 @@ int hashewon(void);
  long paytaxes(long);
  int winshou(void);
  int shou(int);
@@ -592,7 +592,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  
  /* module: bill.c */
  
-@@ -376,53 +376,53 @@ int letter3();
+@@ -376,53 +375,53 @@ int letter3();
  int letter4();
  int letter5();
  int letter6();
@@ -675,7 +675,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  
  /* module: fortune.c */
  
-@@ -430,178 +430,178 @@ char *fortune();
+@@ -430,178 +429,177 @@ char *fortune();
  
  /* module: help.c */
  
@@ -700,7 +700,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
 +void lprint();
 +void lwrite();
  long lgetc1();
- long lrint();
+-long lrint();
 -int lrfill();
 +void lrfill();
  char *lgetw();
@@ -963,7 +963,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  unsigned int sum();
  
  /* module: scores.c */
-@@ -613,96 +613,96 @@ int hashewon();
+@@ -613,96 +611,96 @@ int hashewon();
  long paytaxes();
  int winshou();
  int shou();
@@ -1129,7 +1129,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  
  #endif /* __STD__ */
  
-@@ -718,20 +718,20 @@ extern char savefilename[],scorefile[], 
+@@ -718,20 +716,20 @@ extern char savefilename[],scorefile[], 
  extern char objnamelist[],optsfile[],*potionname[],stealth[MAXX][MAXY];
  extern char *scrollname[],*spelcode[],*speldescript[];
  extern char *class[],course[],diagfile[],fortfile[],helpfile[];
@@ -1155,7 +1155,7 @@ $NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
  extern char ramboflag, compress;
  
  extern short hitp[MAXX][MAXY], ivenarg[], screen[MAXX][MAXY];
-@@ -739,6 +739,17 @@ extern short iarg[MAXX][MAXY], lastnum;	
+@@ -739,6 +737,17 @@ extern short iarg[MAXX][MAXY], lastnum;	
  
  extern int yrepcount,userid;
  extern int ipoint, iepoint;
diff --git a/games/ularn/patches/patch-ai b/games/ularn/patches/patch-ai
index 46e0bf54e7a..2fa7456aaad 100644
--- a/games/ularn/patches/patch-ai
+++ b/games/ularn/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/04/27 15:27:31 agc Exp $
+$NetBSD: patch-ai,v 1.2 2005/02/28 02:26:59 ben Exp $
 
---- fortune.c.orig	Fri Jun 19 13:55:36 1992
-+++ fortune.c	Sat Jan 13 18:07:37 2001
+--- fortune.c.orig	1992-06-19 13:55:36.000000000 -0700
++++ fortune.c
 @@ -1,4 +1,8 @@
  /* fortune.c */
 +#include <sys/types.h>
@@ -11,3 +11,11 @@ $NetBSD: patch-ai,v 1.1.1.1 2001/04/27 15:27:31 agc Exp $
  #include "header.h"
  #include "extern.h"
  /*
+@@ -16,7 +20,6 @@ char *file;
+ 	int lines,tmp;
+ 	struct stat stat;
+ 	int retval;
+-	char *malloc();
+ 
+ 	if (fortune_fd==0) {
+ 		/* open the file */
diff --git a/games/ularn/patches/patch-al b/games/ularn/patches/patch-al
index cde32307790..17460f3b73d 100644
--- a/games/ularn/patches/patch-al
+++ b/games/ularn/patches/patch-al
@@ -1,8 +1,16 @@
-$NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
+$NetBSD: patch-al,v 1.4 2005/02/28 02:26:59 ben Exp $
 
 --- io.c.orig	1995-01-18 11:48:27.000000000 -0800
 +++ io.c
-@@ -47,12 +47,18 @@
+@@ -19,7 +19,6 @@
+  *	FILE INPUT ROUTINES
+  *
+  *	long lgetc()			read one character from input buffer
+- *	long lrint()			read one integer from input buffer
+  *	lrfill(address,number)		put input bytes into a buffer
+  *	char *lgetw()			get a whitespace ended word from input
+  *	char *lgetl()			get a \n or EOF ended line from input
+@@ -47,12 +46,18 @@
   *
   * Note: ** entries are available only in termcap mode.
   */
@@ -22,7 +30,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  static int lfd;			/*  output file numbers	*/
  static int fd;				/*  input file numbers	*/
  int ipoint=BUFSIZ,iepoint=BUFSIZ;	/*  input buffering pointers  */
-@@ -61,13 +67,13 @@ static char lgetwbuf[LINBUFSIZE];	/* get
+@@ -61,13 +66,13 @@ static char lgetwbuf[LINBUFSIZE];	/* get
  /*
   *	getcharacter() 	Routine to read in one character from the terminal
   */
@@ -38,7 +46,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  }
  
  
-@@ -75,7 +81,7 @@ getcharacter ()
+@@ -75,7 +80,7 @@ getcharacter ()
   *	newgame() 
   *		Subroutine to save the initial time and seed rnd()
   */
@@ -47,7 +55,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	long *p,*pe;
  
-@@ -101,18 +107,14 @@ newgame ()
+@@ -101,18 +106,14 @@ newgame ()
   */
  /*VARARGS*/
  
@@ -68,7 +76,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  
  	if (lpnt >= lpend) lflush();
  	outb = lpnt;
-@@ -164,7 +166,7 @@ va_dcl
+@@ -164,7 +165,7 @@ va_dcl
  					break;
  				}
  				if (wide==0)  {
@@ -77,7 +85,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  					--outb;
  				}
  				else {
-@@ -172,7 +174,7 @@ va_dcl
+@@ -172,7 +173,7 @@ va_dcl
  					if (left)
  						while (n-- > 0)
  							*outb++ = ' ';
@@ -86,7 +94,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  						;
  					--outb;
  					if (left==0)
-@@ -230,7 +232,7 @@ va_dcl
+@@ -230,7 +231,7 @@ va_dcl
   *	No checking for output buffer overflow is done, but flushes if needed!
   *	Returns nothing of value.
   */
@@ -95,7 +103,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  long x;
  {
  	if (lpnt >= lpend)
-@@ -251,7 +253,7 @@ long x;
+@@ -251,7 +252,7 @@ long x;
   *	Enter with the address and number of bytes to write out
   *	Returns nothing of value
   */
@@ -104,7 +112,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *buf;
  int len;
  {
-@@ -286,7 +288,7 @@ int len;
+@@ -286,7 +287,7 @@ int len;
   *
   *  Returns 0 if EOF, otherwise the character
   */
@@ -113,16 +121,38 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	int i;
  
-@@ -320,7 +322,7 @@ long lgetc1()
-  *	The save order is low order first, to high order (4 bytes total)
-  *	Returns the int read
-  */
--long lrint()
-+long lrint(void)
- {
- 	long i;
+@@ -308,30 +309,6 @@ long lgetc1()
+ }
  
-@@ -339,7 +341,7 @@ long lrint()
+ /*
+- *	long lrint()			Read one integer from input buffer
+- *
+- *		+---------+---------+---------+---------+
+- *		|  high   |	    |	      |   low   |
+- *		|  order  |	    |	      |  order	|
+- *		|   byte  |	    |	      |	  byte	|
+- *		+---------+---------+---------+---------+
+- *	        31  ---  24 23 --- 16 15 ---  8 7  ---   0
+- *
+- *	The save order is low order first, to high order (4 bytes total)
+- *	Returns the int read
+- */
+-long lrint()
+-{
+-	long i;
+-
+-	i  = 255 & lgetc();
+-	i |= (255 & lgetc()) << 8;
+-	i |= (255 & lgetc()) << 16;
+-	i |= (255 & lgetc()) << 24;
+-	return(i);
+-}
+-
+-/*
+  *	lrfill(address,number)			put input bytes into a buffer
+  *		char *address;
+  *		int number;
+@@ -339,7 +316,7 @@ long lrint()
   *	Reads "number" bytes into the buffer pointed to by "address".
   *	Returns nothing of value
   */
@@ -131,7 +161,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *adr;
  int num;
  {
-@@ -379,7 +381,7 @@ int num;
+@@ -379,7 +356,7 @@ int num;
   *
   *	Returns pointer to a buffer that contains word.  If EOF, returns a 0
   */
@@ -140,7 +170,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	char *lgp;
  	int cc, n=LINBUFSIZE, quote=0;
-@@ -412,7 +414,7 @@ char *lgetw()
+@@ -412,7 +389,7 @@ char *lgetw()
   *
   *Returns pointer to a buffer that contains the line.  If EOF, returns 0
   */
@@ -149,7 +179,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	int i=LINBUFSIZE,ch;
  	char *str=lgetwbuf;
-@@ -437,7 +439,7 @@ char *lgetl()
+@@ -437,7 +414,7 @@ char *lgetl()
   *	lcreat((char*)0); means to the terminal
   *	Returns -1 if error, otherwise the file descriptor opened.
   */
@@ -158,7 +188,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *str;
  {
  	lpnt = lpbuf;
-@@ -461,7 +463,7 @@ char *str;
+@@ -461,7 +438,7 @@ char *str;
   *	lopen(0) means from the terminal
   *	Returns -1 if error, otherwise the file descriptor opened.
   */
@@ -167,7 +197,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *str;
  {
  	ipoint = iepoint = BUFSIZ;
-@@ -484,7 +486,7 @@ char *str;
+@@ -484,7 +461,7 @@ char *str;
   *	lappend(0) means to the terminal
   *	Returns -1 if error, otherwise the file descriptor opened.
   */
@@ -176,7 +206,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *str;
  {
  	lpnt = lpbuf;
-@@ -507,7 +509,7 @@ char *str;
+@@ -507,7 +484,7 @@ char *str;
   *
   *	Returns nothing of value.
   */
@@ -185,7 +215,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	if (fd > 0)
  		close(fd);
-@@ -518,7 +520,7 @@ lrclose()
+@@ -518,7 +495,7 @@ lrclose()
   *
   *	Returns nothing of value.
   */
@@ -194,7 +224,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	lflush();
  	if (lfd > 2)
-@@ -529,7 +531,7 @@ lwclose ()
+@@ -529,7 +506,7 @@ lwclose ()
   *	lprcat(string)			append a string to the output buffer
   *					avoids calls to lprintf (time consuming)
   */
@@ -203,7 +233,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *str;
  {
  	char *str2;
-@@ -537,8 +539,7 @@ char *str;
+@@ -537,8 +514,7 @@ char *str;
  	if (lpnt >= lpend)
  		lflush();
  	str2 = lpnt;
@@ -213,7 +243,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  	lpnt = str2 - 1;
  }
  
-@@ -553,15 +554,16 @@ static char cap[256];
+@@ -553,16 +529,17 @@ static char cap[256];
  static char *outbuf=0;	/* translated output buffer */
  char *CM, *CE, *CD, *CL, *SO, *SE, *AL, *DL;/* Termcap capabilities */
  char *HO, *BC, *UP;
@@ -228,12 +258,14 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	char termbuf[1024];
 -	char *pc, *capptr = cap+10;
+-	char *malloc(), *tgetstr(), *term, *getenv();
 +	char *pc;
 +	char *capptr = cap+10;
- 	char *malloc(), *tgetstr(), *term, *getenv();
++	char *term;
  
  	switch (tgetent(termbuf, term = getenv("TERM"))) {
-@@ -584,12 +586,11 @@ init_term ()
+ 	case -1:
+@@ -584,12 +561,11 @@ init_term ()
  	UP = tgetstr("up", &capptr);	/* cursor up */
  	HO = tgetstr("ho", &capptr);	/* home cursor */
  
@@ -250,7 +282,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  
  	if (!(BC = tgetstr("bc", &capptr))) {	/* backspace */
  		if (!(BC=tgetstr("le", &capptr))) {
-@@ -632,7 +633,7 @@ init_term ()
+@@ -632,7 +608,7 @@ init_term ()
  /*
   * cl_up(x,y) Clear screen from [x,1] to current position. Leave cursor at [x,y]
   */
@@ -259,7 +291,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  int x, y;
  {
  	int i;
-@@ -648,7 +649,7 @@ int x, y;
+@@ -648,7 +624,7 @@ int x, y;
  /*
   * cl_dn(x,y) 	Clear screen from [1,y] to end of display. Leave cursor at [x,y]
   */
@@ -268,7 +300,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  int x, y;
  {
  	int i;
-@@ -671,7 +672,7 @@ int x, y;
+@@ -671,7 +647,7 @@ int x, y;
  /*
   * standout(str)  Print the argument string in inverse video (standout mode).
   */
@@ -277,7 +309,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  char *str;
  {
  	if (boldon == 0) {
-@@ -687,7 +688,7 @@ char *str;
+@@ -687,7 +663,7 @@ char *str;
  /*
   * set_score_output() 	Called when output should be literally printed.
   */
@@ -286,7 +318,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  	enable_scroll = -1;
  }
  
-@@ -700,7 +701,7 @@ set_score_output() {
+@@ -700,7 +676,7 @@ set_score_output() {
   */
  static int scrline=18; /* line # for wraparound instead of scrolling if no DL */
  
@@ -295,7 +327,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	int lpoint;
  	char *str;
-@@ -796,18 +797,19 @@ static int ind=0;
+@@ -796,18 +772,19 @@ static int ind=0;
  /*
   * putcharacter(c)		Print one character in decoded output buffer.
   */
@@ -317,7 +349,7 @@ $NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
  {
  	if (ind)
  		write(lfd, outbuf, ind);
-@@ -825,7 +827,7 @@ flush_buf()
+@@ -825,7 +802,7 @@ flush_buf()
   *
   *
   */
diff --git a/games/ularn/patches/patch-an b/games/ularn/patches/patch-an
index 29124a89e9c..3b4a38f1784 100644
--- a/games/ularn/patches/patch-an
+++ b/games/ularn/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
+$NetBSD: patch-an,v 1.2 2005/02/28 02:26:59 ben Exp $
 
---- main.c.orig	Fri Jun 19 13:55:33 1992
-+++ main.c	Sat Jan 13 21:53:56 2001
+--- main.c.orig	1992-06-19 13:55:33.000000000 -0700
++++ main.c
 @@ -1,5 +1,8 @@
  /*	main.c		*/
  /* This game is bad for you. It is evil. It will rot your brain. */
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  #include "header.h"
  #include "player.h"
  #include "itm.h"
-@@ -40,7 +43,7 @@
+@@ -40,14 +43,14 @@ static char *optstring = "sicnhro:d:";
  	************
   */
  
@@ -20,7 +20,16 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  int argc;
  char *argv[];
  {
-@@ -55,14 +58,21 @@
+ 	int i, hard;
+ 	char buf[BUFSIZ];
+-	char *malloc(), *getenv(), *getlogin(), *ptr=0;
+-	struct passwd *pwe,*getpwuid();
++	char *ptr=0;
++	struct passwd *pwe;
+ 	extern char *optarg;
+ 	extern int optind, opterr;
+ 
+@@ -55,14 +58,21 @@ char *argv[];
  /*
   *	first task is to identify the player
   */
@@ -49,7 +58,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  	}
  	if (ptr==(char *)NULL)
  		goto noone;
-@@ -109,6 +119,9 @@
+@@ -109,6 +119,9 @@ noone:		    	fprintf(stderr,"Who *are* y
  
  	init_cells();	/* initialize dungeon storage */
  
@@ -59,7 +68,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  	lcreat((char*)0);	
  	newgame();		/*	set the initial clock  */
  	hard= -1;
-@@ -277,6 +290,7 @@
+@@ -277,6 +290,7 @@ noone:		    	fprintf(stderr,"Who *are* y
  		  	}
  	}	/* end main loop */
  	/* NOTREACHED */
@@ -67,7 +76,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  }	/* end main */
  
  
-@@ -285,7 +299,7 @@
+@@ -285,7 +299,7 @@ noone:		    	fprintf(stderr,"Who *are* y
   *
   *	get and execute a command
   */
@@ -76,7 +85,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  {
  	int i,j;
  	int k,flag;
-@@ -393,7 +407,7 @@
+@@ -393,7 +407,7 @@ parse ()
  					nomove=1;
  					return;	/*give the help screen*/
  
@@ -85,7 +94,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  					lprcat("Saving . . .");
  					lflush();
  					if (savegame(savefilename) == -1 && compress) {
-@@ -533,18 +547,18 @@
+@@ -533,18 +547,18 @@ parse ()
  					for (i=0; i<SPNUM; i++)	
  						spelknow[i]=1;
  					for (i=0; i<MAXSCROLL; i++)
@@ -108,7 +117,7 @@ $NetBSD: patch-an,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
  					item[i][0]=OPOTION;
  					iarg[i][0]=i-MAXX+MAXPOTION;
  				  }
-@@ -619,7 +633,7 @@
+@@ -619,7 +633,7 @@ lprintf( "\nThe Addiction of Ularn - Ver
  	}
  }