From 2233b6973b8fb8afa809a62ed2b4f4d4859cb8c6 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 6 Oct 1993 11:45:13 +0000
Subject: [PATCH] Several fixes; ported to Solaris 2

---
 util/ass/ass00.c |  2 +-
 util/ass/ass80.c |  7 +++----
 util/ass/assrl.c | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/util/ass/ass00.c b/util/ass/ass00.c
index d71a137b7..5f96950a7 100644
--- a/util/ass/ass00.c
+++ b/util/ass/ass00.c
@@ -110,7 +110,7 @@ argument(arg) char *arg; {
 		return;
 	}
 	curfile = arg;  /* for error messages etc. */
-	if ((ifile = fopen(arg,"r")) == NULL) {
+	if ((ifile = fopen(arg,"r")) == 0) {
 		error("can't open %s",arg);
 		return;
 	}
diff --git a/util/ass/ass80.c b/util/ass/ass80.c
index 76e96152b..906907097 100644
--- a/util/ass/ass80.c
+++ b/util/ass/ass80.c
@@ -74,9 +74,9 @@ FILE *frewind(f) FILE *f ; {
 	/* Rewind a file open for writing and open it for reading */
 	/* Assumption, file descriptor is r/w */
 	register FILE *tmp ;
-	rewind(f);
 	tmp=fdopen(dup(fileno(f)),"r");
 	fclose(f);
+	rewind(tmp);
 	return tmp ;
 }
 #endif
@@ -377,7 +377,7 @@ setmode(mode) {
 #ifndef CPM
 int tmpfil() {
 	register char *fname, *cpname ;
-	char *sfname;
+	static char sfname[] = "tmp.00000";
 	register fildes,pid;
 	static char name[80] = TMP_DIR ;
 	int count;
@@ -387,10 +387,9 @@ int tmpfil() {
 	 * After closing the tmpfil-descriptor the file is lost
 	 * Calling this routine frees the program from generating uniqe names.
 	 */
-	sfname = fname = "tmp.00000";
+	fname = sfname+4;
 	count = 10;
 	pid = getpid();
-	fname += 4;
 	while (pid!=0) {
 		*fname++ = (pid&07) + '0';
 		pid >>= 3;
diff --git a/util/ass/assrl.c b/util/ass/assrl.c
index 37fdc8513..ccf554ac5 100644
--- a/util/ass/assrl.c
+++ b/util/ass/assrl.c
@@ -116,11 +116,11 @@ copyout() {
 	remtext = textbytes%wordsize ;
 	if ( remtext != 0 ) remtext = wordsize-remtext ;
 
-	if ((ifile = fopen(eout,"w")) == NULL )
+	if ((ifile = fopen(eout,"w")) == 0 )
 		fatal("can't create e.out");
 #ifdef  CPM
-	fclose(tfile); tfile=fopen("TFILE.$$$, "r");
-	fclose(dfile); dfile=fopen("DFILE.$$$, "r");
+	fclose(tfile); tfile=fopen("TFILE.$$$", "r");
+	fclose(dfile); dfile=fopen("DFILE.$$$", "r");
 #else
 	tfile=frewind(tfile);
 	dfile=frewind(dfile);
@@ -160,7 +160,7 @@ dataprocess(f1,f2) FILE *f1,*f2; {
 	register ieof ;
 
 #ifdef  CPM
-	fclose(rdfile); rdfile=fopen("RDFILE.$$$, "r");
+	fclose(rdfile); rdfile=fopen("RDFILE.$$$", "r");
 #else
 	rdfile=frewind(rdfile) ;
 #endif
@@ -210,7 +210,7 @@ textprocess(f1,f2) FILE *f1,*f2; {
 	register FOFFSET keep ;
 
 #ifdef  CPM
-	fclose(rtfile); rtfile=fopen("RTFILE.$$$, "r");
+	fclose(rtfile); rtfile=fopen("RTFILE.$$$", "r");
 #else
 	rtfile=frewind(rtfile) ;
 #endif
-- 
2.34.1