d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Several fixes; ported to Solaris 2

Browse source
This commit is contained in:
ceriel 1993-10-06 11:45:13 +00:00
parent 4092904071
commit 2233b6973b
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
util/ass/ass00.c
View file

@ -110,7 +110,7 @@ argument(arg) char *arg; {
return; return;
} }
curfile = arg; /* for error messages etc. */ curfile = arg; /* for error messages etc. */
if ((ifile = fopen(arg,"r")) == NULL) { if ((ifile = fopen(arg,"r")) == 0) {
error("can't open %s",arg); error("can't open %s",arg);
return; return;
} }

7
util/ass/ass80.c
View file

@ -74,9 +74,9 @@ FILE *frewind(f) FILE *f ; {
/* Rewind a file open for writing and open it for reading */ /* Rewind a file open for writing and open it for reading */
/* Assumption, file descriptor is r/w */ /* Assumption, file descriptor is r/w */
register FILE *tmp ; register FILE *tmp ;
rewind(f);
tmp=fdopen(dup(fileno(f)),"r"); tmp=fdopen(dup(fileno(f)),"r");
fclose(f); fclose(f);
rewind(tmp);
return tmp ; return tmp ;
} }
#endif #endif
@ -377,7 +377,7 @@ setmode(mode) {
#ifndef CPM #ifndef CPM
int tmpfil() { int tmpfil() {
register char *fname, *cpname ; register char *fname, *cpname ;
char *sfname; static char sfname[] = "tmp.00000";
register fildes,pid; register fildes,pid;
static char name[80] = TMP_DIR ; static char name[80] = TMP_DIR ;
int count; int count;
@ -387,10 +387,9 @@ int tmpfil() {
* After closing the tmpfil-descriptor the file is lost * After closing the tmpfil-descriptor the file is lost
* Calling this routine frees the program from generating uniqe names. * Calling this routine frees the program from generating uniqe names.
*/ */
sfname = fname = "tmp.00000"; fname = sfname+4;
count = 10; count = 10;
pid = getpid(); pid = getpid();
fname += 4;
while (pid!=0) { while (pid!=0) {
*fname++ = (pid&07) + '0'; *fname++ = (pid&07) + '0';
pid >>= 3; pid >>= 3;

10
util/ass/assrl.c
View file

@ -116,11 +116,11 @@ copyout() {
remtext = textbytes%wordsize ; remtext = textbytes%wordsize ;
if ( remtext != 0 ) remtext = wordsize-remtext ; if ( remtext != 0 ) remtext = wordsize-remtext ;
if ((ifile = fopen(eout,"w")) == NULL ) if ((ifile = fopen(eout,"w")) == 0 )
fatal("can't create e.out"); fatal("can't create e.out");
#ifdef CPM #ifdef CPM
fclose(tfile); tfile=fopen("TFILE.$$$, "r"); fclose(tfile); tfile=fopen("TFILE.$$$", "r");
fclose(dfile); dfile=fopen("DFILE.$$$, "r"); fclose(dfile); dfile=fopen("DFILE.$$$", "r");
#else #else
tfile=frewind(tfile); tfile=frewind(tfile);
dfile=frewind(dfile); dfile=frewind(dfile);
@ -160,7 +160,7 @@ dataprocess(f1,f2) FILE *f1,*f2; {
register ieof ; register ieof ;
#ifdef CPM #ifdef CPM
fclose(rdfile); rdfile=fopen("RDFILE.$$$, "r"); fclose(rdfile); rdfile=fopen("RDFILE.$$$", "r");
#else #else
rdfile=frewind(rdfile) ; rdfile=frewind(rdfile) ;
#endif #endif
@ -210,7 +210,7 @@ textprocess(f1,f2) FILE *f1,*f2; {
register FOFFSET keep ; register FOFFSET keep ;
#ifdef CPM #ifdef CPM
fclose(rtfile); rtfile=fopen("RTFILE.$$$, "r"); fclose(rtfile); rtfile=fopen("RTFILE.$$$", "r");
#else #else
rtfile=frewind(rtfile) ; rtfile=frewind(rtfile) ;
#endif #endif