head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.44
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.42
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.40
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.38
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.36
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.34
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.32
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.30
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.28
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.26
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.24
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.22
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.20
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.18
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.16
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.14
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.12
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.10
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.8
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.6
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.4
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.2
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.3.0.6
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.4
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.2
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.2.0.2
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.1.1.1.0.10
	pkgsrc-2003Q4-base:1.1.1.1
	netbsd-1-6-1:1.1.1.1.0.6
	netbsd-1-6-1-base:1.1.1.1
	netbsd-1-6:1.1.1.1.0.8
	netbsd-1-6-RELEASE-base:1.1.1.1
	pkgviews:1.1.1.1.0.4
	pkgviews-base:1.1.1.1
	buildlink2:1.1.1.1.0.2
	buildlink2-base:1.1.1.1
	netbsd-1-5-PATCH003:1.1.1.1
	netbsd-1-5-PATCH001:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2005.02.28.02.48.56;	author ben;	state dead;
branches;
next	1.3;

1.3
date	2004.04.15.21.17.08;	author ben;	state Exp;
branches;
next	1.2;

1.2
date	2003.12.06.19.28.22;	author ben;	state Exp;
branches;
next	1.1;

1.1
date	2001.04.27.15.27.32;	author agc;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2001.04.27.15.27.32;	author agc;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Remove ularn package, as the code is unmaintained and messy.
@
text
@$NetBSD: patch-aw,v 1.3 2004/04/15 21:17:08 ben Exp $

--- savelev.c.orig	1992-06-19 13:55:34.000000000 -0700
+++ savelev.c
@@@@ -1,4 +1,7 @@@@
 /* savelev.c	*/
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include "header.h"
 #include "sphere.h"
 #include "player.h"
@@@@ -6,12 +9,7 @@@@
 #include "monst.h"
 #include "extern.h"
 
-extern char *sys_errlist[];
-extern int errno;
-
-typedef char	Char_Ary[MAXX][MAXY];
-typedef short	Short_Ary[MAXX][MAXY];
-typedef long	Long_Ary[MAXX][MAXY];
+typedef int		Int_Ary[MAXX][MAXY];
 typedef struct_mitem	Mitem_Ary[MAXX][MAXY];
 
 static int w = 0;
@@@@ -19,11 +17,11 @@@@ static int r = 0;
 
 /* this is the structure that holds the entire dungeon specifications */
 typedef struct save_lev_str {
-	Short_Ary hitp;
+	Int_Ary hitp;
 	Mitem_Ary mitem;
-	Char_Ary  item;
-	Short_Ary iarg;	/* must be long for goldpiles */
-	Char_Ary  know;
+	Int_Ary item;
+	Int_Ary iarg;
+	Int_Ary know;
 } Saved_Level;
 
 static Saved_Level *saved_levels[NLEVELS];
@@@@ -33,15 +31,15 @@@@ static unsigned int FileSum;
 /*
  *	routine to save the present level into storage
  */
-savelevel()
+void savelevel(void)
 {
 	Saved_Level *storage = saved_levels[level];
 
-	memcpy((char *)storage->hitp,  (char *)hitp,  sizeof(Short_Ary));
+	memcpy((char *)storage->hitp,  (char *)hitp,  sizeof(Int_Ary));
 	memcpy((char *)storage->mitem, (char *)mitem, sizeof(Mitem_Ary));
-	memcpy((char *)storage->item,  (char *)item,  sizeof(Char_Ary));
-	memcpy((char *)storage->iarg,  (char *)iarg,  sizeof(Short_Ary));
-	memcpy((char *)storage->know,  (char *)know,  sizeof(Char_Ary));
+	memcpy((char *)storage->item,  (char *)item,  sizeof(Int_Ary));
+	memcpy((char *)storage->iarg,  (char *)iarg,  sizeof(Int_Ary));
+	memcpy((char *)storage->know,  (char *)know,  sizeof(Int_Ary));
 	level_sums[level] = sum((unsigned char *)storage, sizeof(Saved_Level));
 }
 
@@@@ -49,17 +47,17 @@@@ savelevel()
 /*
  *	routine to restore a level from storage
  */
-getlevel()
+void getlevel(void)
 {
 	unsigned int i;
 
 	Saved_Level *storage = saved_levels[level];
 
-	memcpy((char *)hitp,  (char *)storage->hitp,  sizeof(Short_Ary));
+	memcpy((char *)hitp,  (char *)storage->hitp,  sizeof(Int_Ary));
 	memcpy((char *)mitem, (char *)storage->mitem, sizeof(Mitem_Ary));
-	memcpy((char *)item,  (char *)storage->item,  sizeof(Char_Ary));
-	memcpy((char *)iarg,  (char *)storage->iarg,  sizeof(Short_Ary));
-	memcpy((char *)know,  (char *)storage->know,  sizeof(Char_Ary));
+	memcpy((char *)item,  (char *)storage->item,  sizeof(Int_Ary));
+	memcpy((char *)iarg,  (char *)storage->iarg,  sizeof(Int_Ary));
+	memcpy((char *)know,  (char *)storage->know,  sizeof(Int_Ary));
 
 	if (level_sums[level] > 0) {
 	  if ((i = sum((unsigned char *)storage,sizeof(Saved_Level))) 
@@@@ -82,7 +80,7 @@@@ getlevel()
 /*
  *	to save the game in a file
  */
-savegame(fname)
+int savegame(fname)
 char	*fname;
 {
 	int	i;
@@@@ -145,10 +143,10 @@@@ char	*fname;
 	bwrite(fd,(char * )char_class, 20 * sizeof(char));
 
 	for (i=0; i<MAXSCROLL; i++)
-		bwrite(fd,(char *)scrollname[i], sizeof(scrollname[i]));
+		bwrite(fd, (char *)&scrollknown[i], sizeof(scrollknown[i]));
 
 	for (i=0; i<MAXPOTION; i++)
-		bwrite(fd,(char *)potionname[i], sizeof(potionname[i]));
+		bwrite(fd, (char *)&potionknown[i], sizeof(potionknown[i]));
 
 	bwrite(fd,(char *)spelknow, sizeof(char) * SPNUM);
 	bwrite(fd,(char *)&wizard, sizeof(wizard));
@@@@ -192,18 +190,22 @@@@ char	*fname;
 }
 
 
-restoregame(fname)
+void restoregame(fname)
 char	*fname;
 {
 	int	i;
 	unsigned int thesum, asum;
 	struct sphere *sp,*splast;
 	Saved_Level * storage;
-	char buf[1024], *tmp="/tmp/UtmpXXXXXX", *mktemp();
+	char buf[1024];
     	int fd;
 
+	if (tempfilename != NULL)
+		free(tempfilename);
+	tempfilename = strdup("/tmp/UtmpXXXXXX");
 	if (compress) {
-		if ((tempfilename = mktemp(tmp)) == NULL) {
+		fd = mkstemp(tempfilename);
+		if (fd == -1) {
 			fprintf(stderr,"Can't create temp file to restore game\n");
 			perror("mktemp");
 			nosignal=0;
@@@@ -221,15 +223,18 @@@@ char	*fname;
 			sleep(4);
 			c[GOLD] = c[BANKACCOUNT] = 0;
 			died(-265);
+			close(fd);
 			unlink(tempfilename);
 			return;
 		}
-		if ((fd = open(tempfilename, O_RDONLY)) < 0) {
+		if (lseek(fd, 0, SEEK_SET) < 0) {
 			fprintf(stderr,"Can't open temp file to restore game\n");
 			perror("open");
 			sleep(4);
 			c[GOLD] = c[BANKACCOUNT] = 0;
 			died(-265);
+			close(fd);
+			unlink(tempfilename);
 			return;
 		}
 	} else {
@@@@ -273,10 +278,10 @@@@ char	*fname;
 	bread(fd,(char * )char_class, sizeof(char) * 20);
 
 	for (i=0; i<MAXSCROLL; i++)
-		bread(fd,(char *)scrollname[i], sizeof(scrollname[i]));
+		bread(fd, (char *)&scrollknown[i], sizeof(scrollknown[i]));
 
 	for (i=0; i<MAXPOTION; i++)
-		bread(fd,(char *)potionname[i], sizeof(potionname[i]));
+		bread(fd, (char *)&potionknown[i], sizeof(potionknown[i]));
 
 	bread(fd,(char * )spelknow, sizeof(char) * SPNUM);
 
@@@@ -350,7 +355,7 @@@@ char	*fname;
 /*
 	subroutine to not allow greedy cheaters
  */
-greedy()
+void greedy(void)
 {
 	if (wizard) 
 		return;
@@@@ -370,7 +375,7 @@@@ lprcat("In that you are GREEDY as well a
 	subroutine to not allow altered save files and terminate the attempted
 	restart
  */
-fsorry()
+void fsorry(void)
 {
 	if (cheat) 
 		return;
@@@@ -385,7 +390,7 @@@@ fsorry()
 /*
 	subroutine to not allow game if save file can't be deleted
  */
-fcheat()
+void fcheat(void)
 {
 	if (wizard) 
 		return;
@@@@ -403,7 +408,7 @@@@ lprcat("is in.  Since this is unfair to 
 }
 
 
-init_cells()
+void init_cells(void)
 {
 	int	i;
 
@@@@ -415,18 +420,20 @@@@ init_cells()
 }
 
 
-bwrite(fd, buf, num)
+void bwrite(fd, buf, num)
 int fd;
 char *buf;
 long num;
 {
 	int nwrote;
 	static int ncalls = 0;
+	char *zerror;
 
 	ncalls++;
 	if ((nwrote = write(fd, buf, num)) == -1) {
+		zerror = strerror(errno);
 		fprintf(stderr, "Error writing to save file\n");
-		fprintf(stderr, "errno = %d\t[%s]\n",errno,sys_errlist[errno]);
+		fprintf(stderr, "errno = %d\t[%s]\n",errno,zerror);
 		fprintf(stderr, "    Wrote %d bytes so far\n", w);
 		fprintf(stderr, "        Call: %d\n", ncalls);
 		abort();
@@@@ -437,7 +444,7 @@@@ long num;
 	w += nwrote;
 	if (nwrote != num) {
 		fprintf(stderr, "Error writing to save file\n");
-		fprintf(stderr, "wrote %d, wanted %d\n", nwrote, num);
+		fprintf(stderr, "wrote %d, wanted %ld\n", nwrote, num);
 		fprintf(stderr, "    Wrote %d bytes so far\n", w);
 		fprintf(stderr, "        Call: %d\n", ncalls);
 		sleep(4);
@@@@ -446,18 +453,20 @@@@ long num;
 	FileSum += sum((unsigned char *)buf, num);
 }
 
-bread(fd, buf, num)
+void bread(fd, buf, num)
 int fd;
 char *buf;
 long num;
 {
 	int nread;
 	static int ncalls = 0;
+	char *zerror;
 
 	ncalls++;
 	if ((nread = read(fd, buf, num)) == -1) {
+		zerror = strerror(errno);
 		fprintf(stderr, "Error reading from save file\n");
-		fprintf(stderr, "errno = %d\t[%s]\n",errno,sys_errlist[errno]);
+		fprintf(stderr, "errno = %d\t[%s]\n",errno,zerror);
 		fprintf(stderr, "    Read %d bytes so far\n", w);
 		fprintf(stderr, "        Call: %d\n", ncalls);
 		perror("read");
@@@@ -467,7 +476,7 @@@@ long num;
 	r += nread;
 	if (nread != num) {
 		fprintf(stderr, "Error reading save file\n");
-		fprintf(stderr, "  Got %d, wanted %d bytes\n", nread, num);
+		fprintf(stderr, "  Got %d, wanted %ld bytes\n", nread, num);
 		fprintf(stderr, "    Read %d bytes so far\n", r);
 		fprintf(stderr, "        Call: %d\n", ncalls);
 		sleep(4);
@


1.3
log
@Make ularn build and run in Linux.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update Ularn to fix a few things:
* Replace varargs with stdarg, in order to compile under gcc 3.3.
* Replace mktemp with mkstemp, in order to silence warnings
* Remove share directory from PLIST, since score file is not deleted.
@
text
@d5 1
a5 1
@@@@ -1,4 +1,6 @@@@
d7 1
d13 7
a19 4
@@@@ -9,9 +11,7 @@@@
 extern char *sys_errlist[];
 extern int errno;
 
d27 1
a27 1
@@@@ -19,11 +19,11 @@@@ static int r = 0;
d43 1
a43 1
@@@@ -33,15 +33,15 @@@@ static unsigned int FileSum;
d64 1
a64 1
@@@@ -49,17 +49,17 @@@@ savelevel()
d87 1
a87 1
@@@@ -82,7 +82,7 @@@@ getlevel()
d96 1
a96 1
@@@@ -145,10 +145,10 @@@@ char	*fname;
d109 1
a109 1
@@@@ -192,18 +192,22 @@@@ char	*fname;
d135 1
a135 1
@@@@ -221,15 +225,18 @@@@ char	*fname;
d155 1
a155 1
@@@@ -273,10 +280,10 @@@@ char	*fname;
d168 1
a168 1
@@@@ -350,7 +357,7 @@@@ char	*fname;
d177 1
a177 1
@@@@ -370,7 +377,7 @@@@ lprcat("In that you are GREEDY as well a
d186 1
a186 1
@@@@ -385,7 +392,7 @@@@ fsorry()
d195 1
a195 1
@@@@ -403,7 +410,7 @@@@ lprcat("is in.  Since this is unfair to 
d204 1
a204 1
@@@@ -415,18 +422,20 @@@@ init_cells()
d227 1
a227 1
@@@@ -437,7 +446,7 @@@@ long num;
d236 1
a236 1
@@@@ -446,18 +455,20 @@@@ long num;
d259 1
a259 1
@@@@ -467,7 +478,7 @@@@ long num;
@


1.1
log
@Initial revision
@
text
@d3 2
a4 2
--- savelev.c.orig	Fri Jun 19 13:55:34 1992
+++ savelev.c	Sun Jan 14 15:27:32 2001
d23 1
a23 1
@@@@ -19,11 +19,11 @@@@
d39 1
a39 1
@@@@ -33,15 +33,15 @@@@
d60 1
a60 1
@@@@ -49,17 +49,17 @@@@
d83 1
a83 1
@@@@ -82,7 +82,7 @@@@
d92 1
a92 1
@@@@ -145,10 +145,10 @@@@
d105 1
a105 1
@@@@ -192,18 +192,22 @@@@
a118 1
+	char *tmp;
d121 3
a123 1
+	tmp = strdup("/tmp/UtmpXXXXXX");
d126 2
a127 3
+		tempfilename = mktemp(tmp);
+		free(tmp);
+		if (tempfilename == NULL) {
d131 21
a151 1
@@@@ -273,10 +277,10 @@@@
d164 1
a164 1
@@@@ -350,7 +354,7 @@@@
d173 1
a173 1
@@@@ -370,7 +374,7 @@@@
d182 1
a182 1
@@@@ -385,7 +389,7 @@@@
d191 1
a191 1
@@@@ -403,7 +407,7 @@@@
d200 1
a200 1
@@@@ -415,18 +419,20 @@@@
d223 1
a223 1
@@@@ -437,7 +443,7 @@@@
d232 1
a232 1
@@@@ -446,18 +452,20 @@@@
d255 1
a255 1
@@@@ -467,7 +475,7 @@@@
@


1.1.1.1
log
@Initial import of ularn-6.12.92 into the packages collection.

Provided in PR 12072 by Ben Collver (collver@@linuxfreemail.com).

Ularn is a fantasy games in which your child has contracted a strange dis-
ease, and none of your home remedies seem to have any effect.  You set
out to find a remedy in a limited amount of time, and to collect gold
along the way of course!

Ularn is based on larn, and adds the concept of character classes.
@
text
@@