-/* $NetBSD: io.c,v 1.4 1997/08/11 14:06:15 christos Exp $ */
+/* $NetBSD: io.c,v 1.22 2009/08/25 06:56:52 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: io.c,v 1.4 1997/08/11 14:06:15 christos Exp $");
+__RCSID("$NetBSD: io.c,v 1.22 2009/08/25 06:56:52 dholland Exp $");
#endif
#endif /* not lint */
/* Re-coding of advent in C: file i/o and user i/o */
+#include <err.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "hdr.h"
#include "extern.h"
-
+static int next(void);
+static void rdesc(int);
+static void rdefault(void);
+static void rhints(void);
+static void rliq(void);
+static void rlocs(void);
+static int rnum(void);
+static void rtrav(void);
+static void rvoc(void);
+
+/* get command from user */
+/* no prompt, usually */
void
-getin(wrd1,wrd2) /* get command from user */
-char **wrd1,**wrd2; /* no prompt, usually */
-{ register char *s;
- static char wd1buf[MAXSTR],wd2buf[MAXSTR];
- int first, numch;
-
- *wrd1=wd1buf; /* return ptr to internal string*/
- *wrd2=wd2buf;
- wd2buf[0]=0; /* in case it isn't set here */
- for (s=wd1buf, first=1, numch=0;;)
- { if ((*s=getchar())>='A' && *s <='Z') *s = *s - ('A' -'a');
- /* convert to upper case */
- switch(*s) /* start reading from user */
- { case '\n':
- *s=0;
+getin(char **wrd1, char **wrd2)
+{
+ char *s;
+ static char wd1buf[MAXSTR], wd2buf[MAXSTR];
+ int first, numch, c;
+
+ *wrd1 = wd1buf; /* return ptr to internal str */
+ *wrd2 = wd2buf;
+ wd2buf[0] = 0; /* in case it isn't set here */
+ for (s = wd1buf, first = 1, numch = 0;;) {
+ c = getchar();
+ if ((*s = (char)c) >= 'A' && *s <= 'Z')
+ *s = *s - ('A' - 'a');
+ /* convert to upper case */
+ switch (c) { /* start reading from user */
+ case '\n':
+ *s = 0;
return;
- case ' ':
- if (s==wd1buf||s==wd2buf) /* initial blank */
+ case ' ':
+ if (s == wd1buf || s == wd2buf) /* initial blank */
continue;
- *s=0;
- if (first) /* finished 1st wd; start 2nd */
- { first=numch=0;
- s=wd2buf;
+ *s = 0;
+ if (first) { /* finished 1st wd; start 2nd */
+ first = numch = 0;
+ s = wd2buf;
break;
- }
- else /* finished 2nd word */
- { FLUSHLINE;
- *s=0;
+ } else { /* finished 2nd word */
+ FLUSHLINE;
+ *s = 0;
return;
}
- default:
- if (++numch>=MAXSTR) /* string too long */
- { printf("Give me a break!!\n");
- wd1buf[0]=wd2buf[0]=0;
+ case EOF:
+ printf("user closed input stream, quitting...\n");
+ exit(0);
+ default:
+ if (++numch >= MAXSTR) { /* string too long */
+ printf("Give me a break!!\n");
+ wd1buf[0] = wd2buf[0] = 0;
FLUSHLINE;
return;
}
}
}
+/* confirm with rspeak */
int
-confirm(mesg) /* confirm irreversible action */
-char *mesg;
-{ register int result;
- printf("%s",mesg); /* tell him what he did */
- if (getchar()=='y') /* was his first letter a 'y'? */
- result=1;
- else result=0;
- FLUSHLINE;
- return(result);
-}
-
-int
-yes(x,y,z) /* confirm with rspeak */
-int x,y,z;
-{ register int result = TRUE; /* pacify gcc */
- register char ch;
- for (;;)
- { rspeak(x); /* tell him what we want*/
- if ((ch=getchar())=='y')
- result=TRUE;
- else if (ch=='n') result=FALSE;
+yes(int x, int y, int z)
+{
+ int result = TRUE; /* pacify gcc */
+ int ch;
+ for (;;) {
+ rspeak(x); /* tell him what we want */
+ if ((ch = getchar()) == 'y')
+ result = TRUE;
+ else if (ch == 'n')
+ result = FALSE;
+ else if (ch == EOF) {
+ printf("user closed input stream, quitting...\n");
+ exit(0);
+ }
FLUSHLINE;
- if (ch=='y'|| ch=='n') break;
+ if (ch == 'y' || ch == 'n')
+ break;
printf("Please answer the question.\n");
}
- if (result==TRUE) rspeak(y);
- if (result==FALSE) rspeak(z);
- return(result);
+ if (result == TRUE)
+ rspeak(y);
+ if (result == FALSE)
+ rspeak(z);
+ return (result);
}
+/* confirm with mspeak */
int
-yesm(x,y,z) /* confirm with mspeak */
-int x,y,z;
-{ register int result = TRUE; /* pacify gcc */
- register char ch;
- for (;;)
- { mspeak(x); /* tell him what we want*/
- if ((ch=getchar())=='y')
- result=TRUE;
- else if (ch=='n') result=FALSE;
+yesm(int x, int y, int z)
+{
+ int result = TRUE; /* pacify gcc */
+ int ch;
+ for (;;) {
+ mspeak(x); /* tell him what we want */
+ if ((ch = getchar()) == 'y')
+ result = TRUE;
+ else if (ch == 'n')
+ result = FALSE;
+ else if (ch == EOF) {
+ printf("user closed input stream, quitting...\n");
+ exit(0);
+ }
FLUSHLINE;
- if (ch=='y'|| ch=='n') break;
+ if (ch == 'y' || ch == 'n')
+ break;
printf("Please answer the question.\n");
}
- if (result==TRUE) mspeak(y);
- if (result==FALSE) mspeak(z);
- return(result);
+ if (result == TRUE)
+ mspeak(y);
+ if (result == FALSE)
+ mspeak(z);
+ return (result);
}
-
/* FILE *inbuf,*outbuf; */
-char *inptr; /* Pointer into virtual disk */
+static char *inptr; /* Pointer into virtual disk */
-int outsw = 0; /* putting stuff to data file? */
+static int outsw = 0; /* putting stuff to data file? */
-char iotape[] = "Ax3F'\003tt$8h\315qer*h\017nGKrX\207:!l";
-char *tape = iotape; /* pointer to encryption tape */
+static const char iotape[] = "Ax3F'\003tt$8h\315qer*h\017nGKrX\207:!l";
+static const char *tape = iotape; /* pointer to encryption tape */
-int
-next() /* next virtual char, bump adr */
-{
- int ch;
+/* next virtual char, bump adr */
+static int
+next(void)
+{
+ int ch;
- ch=(*inptr ^ random()) & 0xFF; /* Decrypt input data */
- if (outsw) /* putting data in tmp file */
- { if (*tape==0) tape=iotape; /* rewind encryption tape */
- *inptr = ch ^ *tape++; /* re-encrypt and replace value */
+ ch = (*inptr ^ random()) & 0xFF; /* Decrypt input data */
+ if (outsw) { /* putting data in tmp file */
+ if (*tape == 0)
+ tape = iotape; /* rewind encryption tape */
+ *inptr = ch ^ *tape++; /* re-encrypt and replace value */
}
inptr++;
- return(ch);
+ return (ch);
}
-char breakch; /* tell which char ended rnum */
+static char breakch; /* tell which char ended rnum */
+/* "read" data from virtual file */
void
-rdata() /* "read" data from virtual file*/
-{ register int sect;
- register char ch;
+rdata(void)
+{
+ int sect;
+ char ch;
- inptr = data_file; /* Pointer to virtual data file */
- srandom(SEED); /* which is lightly encrypted. */
+ inptr = data_file; /* Pointer to virtual data file */
+ srandom(SEED); /* which is lightly encrypted. */
- clsses=1;
- for (;;) /* read data sections */
- { sect=next()-'0'; /* 1st digit of section number */
+ classes = 1;
+ for (;;) { /* read data sections */
+ sect = next() - '0'; /* 1st digit of section number */
#ifdef VERBOSE
- printf("Section %c",sect+'0');
+ printf("Section %c", sect + '0');
#endif
- if ((ch=next())!=LF) /* is there a second digit? */
- {
+ if ((ch = next()) != LF) { /* is there a second digit? */
FLUSHLF;
#ifdef VERBOSE
putchar(ch);
#endif
- sect=10*sect+ch-'0';
+ sect = 10 * sect + ch - '0';
}
#ifdef VERBOSE
putchar('\n');
#endif
- switch(sect)
- { case 0: /* finished reading database */
+ switch (sect) {
+ case 0: /* finished reading database */
return;
- case 1: /* long form descriptions */
+ case 1: /* long form descriptions */
rdesc(1);
break;
- case 2: /* short form descriptions */
+ case 2: /* short form descriptions */
rdesc(2);
break;
- case 3: /* travel table */
- rtrav(); break;
- case 4: /* vocabulary */
+ case 3: /* travel table */
+ rtrav();
+ break;
+ case 4: /* vocabulary */
rvoc();
break;
- case 5: /* object descriptions */
+ case 5: /* object descriptions */
rdesc(5);
break;
- case 6: /* arbitrary messages */
+ case 6: /* arbitrary messages */
rdesc(6);
break;
- case 7: /* object locations */
- rlocs(); break;
- case 8: /* action defaults */
- rdflt(); break;
- case 9: /* liquid assets */
- rliq(); break;
- case 10: /* class messages */
+ case 7: /* object locations */
+ rlocs();
+ break;
+ case 8: /* action defaults */
+ rdefault();
+ break;
+ case 9: /* liquid assets */
+ rliq();
+ break;
+ case 10: /* class messages */
rdesc(10);
break;
- case 11: /* hints */
- rhints(); break;
- case 12: /* magic messages */
+ case 11: /* hints */
+ rhints();
+ break;
+ case 12: /* magic messages */
rdesc(12);
break;
- default:
- printf("Invalid data section number: %d\n",sect);
- for (;;) putchar(next());
+ default:
+ printf("Invalid data section number: %d\n", sect);
+ for (;;)
+ putchar(next());
}
- if (breakch!=LF) /* routines return after "-1" */
+ if (breakch != LF) /* routines return after "-1" */
FLUSHLF;
}
}
-char nbf[12];
-
+static char nbf[12];
-int
-rnum() /* read initial location num */
-{ register char *s;
- tape = iotape; /* restart encryption tape */
- for (s=nbf,*s=0;; s++)
- if ((*s=next())==TAB || *s=='\n' || *s==LF)
+/* read initial location num */
+static int
+rnum(void)
+{
+ char *s;
+ tape = iotape; /* restart encryption tape */
+ for (s = nbf, *s = 0;; s++)
+ if ((*s = next()) == TAB || *s == '\n' || *s == LF)
break;
- breakch= *s; /* save char for rtrav() */
- *s=0; /* got the number as ascii */
- if (nbf[0]=='-') return(-1); /* end of data */
- return(atoi(nbf)); /* convert it to integer */
+ breakch = *s; /* save char for rtrav() */
+ *s = 0; /* got the number as ascii */
+ if (nbf[0] == '-')
+ return (-1); /* end of data */
+ return (atoi(nbf)); /* convert it to integer */
}
-char *seekhere;
+static char *seekhere;
-void
-rdesc(sect) /* read description-format msgs */
-int sect;
-{ register int locc;
- char *seekstart, *maystart;
-
- seekhere = inptr; /* Where are we in virtual file?*/
- outsw=1; /* these msgs go into tmp file */
- for (oldloc= -1, seekstart=seekhere;;)
- { maystart=inptr; /* maybe starting new entry */
- if ((locc=rnum())!=oldloc && oldloc>=0 /* finished msg */
- && ! (sect==5 && (locc==0 || locc>=100)))/* unless sect 5*/
- { switch(sect) /* now put it into right table */
- { case 1: /* long descriptions */
- ltext[oldloc].seekadr=seekhere;
- ltext[oldloc].txtlen=maystart-seekstart;
+/* read description-format msgs */
+static void
+rdesc(int sect)
+{
+ int locc;
+ char *seekstart, *maystart;
+
+ seekhere = inptr; /* Where are we in virtual file? */
+ outsw = 1; /* these msgs go into tmp file */
+ for (oldloc = -1, seekstart = seekhere;;) {
+ maystart = inptr; /* maybe starting new entry */
+ if ((locc = rnum()) != oldloc && oldloc >= 0 /* finished msg */
+ /* unless sect 5 */
+ && !(sect == 5 && (locc == 0 || locc >= 100))) {
+ switch (sect) { /* now put it into right table */
+ case 1:/* long descriptions */
+ ltext[oldloc].seekadr = seekhere;
+ ltext[oldloc].txtlen = maystart - seekstart;
break;
- case 2: /* short descriptions */
- stext[oldloc].seekadr=seekhere;
- stext[oldloc].txtlen=maystart-seekstart;
+ case 2:/* short descriptions */
+ stext[oldloc].seekadr = seekhere;
+ stext[oldloc].txtlen = maystart - seekstart;
break;
- case 5: /* object descriptions */
- ptext[oldloc].seekadr=seekhere;
- ptext[oldloc].txtlen=maystart-seekstart;
+ case 5:/* object descriptions */
+ ptext[oldloc].seekadr = seekhere;
+ ptext[oldloc].txtlen = maystart - seekstart;
break;
- case 6: /* random messages */
- if (oldloc>RTXSIZ)
- { printf("Too many random msgs\n");
- exit(0);
- }
- rtext[oldloc].seekadr=seekhere;
- rtext[oldloc].txtlen=maystart-seekstart;
+ case 6:/* random messages */
+ if (oldloc >= RTXSIZE)
+ errx(1,"Too many random msgs");
+ rtext[oldloc].seekadr = seekhere;
+ rtext[oldloc].txtlen = maystart - seekstart;
break;
- case 10: /* class messages */
- ctext[clsses].seekadr=seekhere;
- ctext[clsses].txtlen=maystart-seekstart;
- cval[clsses++]=oldloc;
+ case 10: /* class messages */
+ ctext[classes].seekadr = seekhere;
+ ctext[classes].txtlen = maystart - seekstart;
+ cval[classes++] = oldloc;
break;
- case 12: /* magic messages */
- if (oldloc>MAGSIZ)
- { printf("Too many magic msgs\n");
- exit(0);
- }
- mtext[oldloc].seekadr=seekhere;
- mtext[oldloc].txtlen=maystart-seekstart;
+ case 12: /* magic messages */
+ if (oldloc >= MAGSIZE)
+ errx(1,"Too many magic msgs");
+ mtext[oldloc].seekadr = seekhere;
+ mtext[oldloc].txtlen = maystart - seekstart;
break;
- default:
- printf("rdesc called with bad section\n");
- exit(0);
+ default:
+ errx(1,"rdesc called with bad section");
}
- seekhere += maystart-seekstart;
+ seekhere += maystart - seekstart;
}
- if (locc<0)
- { outsw=0; /* turn off output */
- seekhere += 3; /* -1<delimiter> */
+ if (locc < 0) {
+ outsw = 0; /* turn off output */
+ seekhere += 3; /* -1<delimiter> */
return;
}
- if (sect!=5 || (locc>0 && locc<100))
- { if (oldloc!=locc)/* starting a new message */
- seekstart=maystart;
- oldloc=locc;
+ if (sect != 5 || (locc > 0 && locc < 100)) {
+ if (oldloc != locc) /* starting a new message */
+ seekstart = maystart;
+ oldloc = locc;
}
- FLUSHLF; /* scan the line */
+ FLUSHLF; /* scan the line */
}
}
-void
-rtrav() /* read travel table */
-{ register int locc;
- register struct travlist *t = NULL;
- register char *s;
- char buf[12];
- int len,m,n,entries = 0;
-
- for (oldloc= -1;;) /* get another line */
- { if ((locc=rnum())!=oldloc && oldloc>=0) /* end of entry */
- {
- t->next = 0; /* terminate the old entry */
- /* printf("%d:%d entries\n",oldloc,entries); */
- /* twrite(oldloc); */
+/* read travel table */
+static void
+rtrav(void)
+{
+ int locc;
+ struct travlist *t = NULL;
+ char *s;
+ char buf[12];
+ int len, m, n, entries = 0;
+
+ for (oldloc = -1;;) { /* get another line */
+ /* end of entry */
+ if ((locc = rnum()) != oldloc && oldloc >= 0 && t) {
+ t->next = 0; /* terminate the old entry */
+ /* printf("%d:%d entries\n",oldloc,entries); */
+ /* twrite(oldloc); */
}
- if (locc== -1) return;
- if (locc!=oldloc) /* getting a new entry */
- { t=travel[locc]=(struct travlist *) malloc(sizeof (struct travlist));
- /* printf("New travel list for %d\n",locc); */
- entries=0;
- oldloc=locc;
- }
- for (s=buf;; s++) /* get the newloc number /ASCII */
- if ((*s=next())==TAB || *s==LF) break;
- *s=0;
- len=length(buf)-1; /* quad long number handling */
- /* printf("Newloc: %s (%d chars)\n",buf,len); */
- if (len<4) /* no "m" conditions */
- { m=0;
- n=atoi(buf); /* newloc mod 1000 = newloc */
+ if (locc == -1)
+ return;
+ if (locc != oldloc) { /* getting a new entry */
+ t = travel[locc] = calloc(1, sizeof(*t));
+ if (t == NULL)
+ err(1, NULL);
+ /* printf("New travel list for %d\n",locc); */
+ entries = 0;
+ oldloc = locc;
}
- else /* a long integer */
- { n=atoi(buf+len-3);
- buf[len-3]=0; /* terminate newloc/1000 */
- m=atoi(buf);
+ for (s = buf;; s++) /* get the newloc number /ASCII */
+ if ((*s = next()) == TAB || *s == LF)
+ break;
+ *s = 0;
+ len = length(buf) - 1; /* quad long number handling */
+ /* printf("Newloc: %s (%d chars)\n",buf,len); */
+ if (len < 4) { /* no "m" conditions */
+ m = 0;
+ n = atoi(buf); /* newloc mod 1000 = newloc */
+ } else { /* a long integer */
+ n = atoi(buf + len - 3);
+ buf[len - 3] = 0; /* terminate newloc/1000 */
+ m = atoi(buf);
}
- while (breakch!=LF) /* only do one line at a time */
- { if (entries++) t=t->next=(struct travlist *) malloc(sizeof (struct travlist));
- t->tverb=rnum();/* get verb from the file */
- t->tloc=n; /* table entry mod 1000 */
- t->conditions=m;/* table entry / 1000 */
- /* printf("entry %d for %d\n",entries,locc); */
+ while (breakch != LF) { /* only do one line at a time */
+ if (t == NULL)
+ abort();
+ if (entries++) {
+ t->next = calloc(1, sizeof(*t));
+ if (t->next == NULL)
+ err(1, NULL);
+ t = t->next;
+ }
+ t->tverb = rnum(); /* get verb from the file */
+ t->tloc = n; /* table entry mod 1000 */
+ t->conditions = m; /* table entry / 1000 */
+ /* printf("entry %d for %d\n",entries,locc); */
}
}
}
-
#ifdef DEBUG
+/* travel options from this loc */
void
-twrite(loq) /* travel options from this loc */
-int loq;
-{ register struct travlist *t;
+twrite(int loq)
+{
+ struct travlist *t;
printf("If");
speak(<ext[loq]);
printf("then\n");
- for (t=travel[loq]; t!=0; t=t->next)
- { printf("verb %d takes you to ",t->tverb);
- if (t->tloc<=300)
+ for (t = travel[loq]; t != 0; t = t->next) {
+ printf("verb %d takes you to ", t->tverb);
+ if (t->tloc <= 300)
speak(<ext[t->tloc]);
- else if (t->tloc<=500)
- printf("special code %d\n",t->tloc-300);
else
- rspeak(t->tloc-500);
- printf("under conditions %d\n",t->conditions);
+ if (t->tloc <= 500)
+ printf("special code %d\n", t->tloc - 300);
+ else
+ rspeak(t->tloc - 500);
+ printf("under conditions %d\n", t->conditions);
}
}
+#endif /* DEBUG */
-#endif /* DEBUG */
-
-void
-rvoc()
-{ register char *s; /* read the vocabulary */
- register int index;
- char buf[6];
- for (;;)
- { index=rnum();
- if (index<0) break;
- for (s=buf,*s=0;; s++) /* get the word */
- if ((*s=next())==TAB || *s=='\n' || *s==LF
- || *s==' ') break;
- /* terminate word with newline, LF, tab, blank */
- if (*s!='\n' && *s!=LF) FLUSHLF; /* can be comments */
- *s=0;
- /* printf("\"%s\"=%d\n",buf,index);*/
- vocab(buf,-2,index);
+/* read the vocabulary */
+static void
+rvoc(void)
+{
+ char *s;
+ int idx;
+ char buf[6];
+ for (;;) {
+ idx = rnum();
+ if (idx < 0)
+ break;
+ for (s = buf, *s = 0;; s++) /* get the word */
+ if ((*s = next()) == TAB || *s == '\n' || *s == LF
+ || *s == ' ')
+ break;
+ /* terminate word with newline, LF, tab, blank */
+ if (*s != '\n' && *s != LF)
+ FLUSHLF;/* can be comments */
+ *s = 0;
+ /* printf("\"%s\"=%d\n",buf,idx); */
+ vocab(buf, -2, idx);
}
/* prht(); */
}
-
-void
-rlocs() /* initial object locations */
-{ for (;;)
- { if ((obj=rnum())<0) break;
- plac[obj]=rnum(); /* initial loc for this obj */
- if (breakch==TAB) /* there's another entry */
- fixd[obj]=rnum();
- else fixd[obj]=0;
+/* initial object locations */
+static void
+rlocs(void)
+{
+ for (;;) {
+ if ((obj = rnum()) < 0)
+ break;
+ plac[obj] = rnum(); /* initial loc for this obj */
+ if (breakch == TAB) /* there's another entry */
+ fixd[obj] = rnum();
+ else
+ fixd[obj] = 0;
}
}
-void
-rdflt() /* default verb messages */
-{ for (;;)
- { if ((verb=rnum())<0) break;
- actspk[verb]=rnum();
+/* default verb messages */
+static void
+rdefault(void)
+{
+ for (;;) {
+ if ((verb = rnum()) < 0)
+ break;
+ actspeak[verb] = rnum();
}
}
-void
-rliq() /* liquid assets &c: cond bits */
-{ register int bitnum;
- for (;;) /* read new bit list */
- { if ((bitnum=rnum())<0) break;
- for (;;) /* read locs for bits */
- { cond[rnum()] |= setbit[bitnum];
- if (breakch==LF) break;
+/* liquid assets &c: cond bits */
+static void
+rliq(void)
+{
+ int bitnum;
+ for (;;) { /* read new bit list */
+ if ((bitnum = rnum()) < 0)
+ break;
+ for (;;) { /* read locs for bits */
+ int n = rnum();
+ if (n < 0)
+ break;
+ cond[n] |= setbit[bitnum];
+ if (breakch == LF)
+ break;
}
}
}
-void
-rhints()
-{ register int hintnum,i;
- hntmax=0;
- for (;;)
- { if ((hintnum=rnum())<0) break;
- for (i=1; i<5; i++)
- hints[hintnum][i]=rnum();
- if (hintnum>hntmax) hntmax=hintnum;
+static void
+rhints(void)
+{
+ int hintnum, i;
+ hintmax = 0;
+ for (;;) {
+ if ((hintnum = rnum()) < 0)
+ break;
+ for (i = 1; i < 5; i++)
+ hints[hintnum][i] = rnum();
+ if (hintnum > hintmax)
+ hintmax = hintnum;
}
}
void
-rspeak(msg)
-int msg;
-{ if (msg!=0) speak(&rtext[msg]);
+rspeak(int msg)
+{
+ if (msg != 0)
+ speak(&rtext[msg]);
}
void
-mspeak(msg)
-int msg;
-{ if (msg!=0) speak(&mtext[msg]);
+mspeak(int msg)
+{
+ if (msg != 0)
+ speak(&mtext[msg]);
}
+/* read, decrypt, and print a message (not ptext) */
+/* msg is a pointer to seek address and length of mess */
void
-speak(msg) /* read, decrypt, and print a message (not ptext) */
-struct text *msg;/* msg is a pointer to seek address and length of mess */
+speak(const struct text *msg)
{
- register char *s, nonfirst;
+ char *s, nonfirst;
s = msg->seekadr;
- nonfirst=0;
- while (s - msg->seekadr < msg->txtlen) /* read a line at a time */
- { tape=iotape; /* restart decryption tape */
+ nonfirst = 0;
+ while (s - msg->seekadr < msg->txtlen) { /* read a line at a time */
+ tape = iotape; /* restart decryption tape */
while ((*s++ ^ *tape++) != TAB); /* read past loc num */
/* assume tape is longer than location number */
- /* plus the lookahead put together */
+ /* plus the lookahead put together */
if ((*s ^ *tape) == '>' &&
- (*(s+1) ^ *(tape+1)) == '$' &&
- (*(s+2) ^ *(tape+2)) == '<') break;
- if (blklin && !nonfirst++) putchar('\n');
- do
- { if (*tape == 0) tape = iotape;/* rewind decryp tape */
+ (*(s + 1) ^ *(tape + 1)) == '$' &&
+ (*(s + 2) ^ *(tape + 2)) == '<')
+ break;
+ if (blklin && !nonfirst++)
+ putchar('\n');
+ do {
+ if (*tape == 0)
+ tape = iotape; /* rewind decryp tape */
putchar(*s ^ *tape);
- } while ((*s++ ^ *tape++) != LF); /* better end with LF */
+ } while ((*s++ ^ *tape++) != LF); /* better end with LF */
}
}
-
+/* read, decrypt and print a ptext message */
+/* msg is the number of all the p msgs for this place */
+/* assumes object 1 doesn't have prop 1, obj 2 no prop 2 &c */
void
-pspeak(m,skip) /* read, decrypt an print a ptext message */
-int m; /* msg is the number of all the p msgs for this place */
-int skip; /* assumes object 1 doesn't have prop 1, obj 2 no prop 2 &c*/
+pspeak(int m, int skip)
{
- register char *s,nonfirst;
- char *numst, save;
+ char *s, nonfirst;
+ char *numst;
struct text *msg;
- char *tbuf;
+ char *tbuf;
msg = &ptext[m];
- if ((tbuf=(char *) malloc(msg->txtlen + 1)) == 0) bug(108);
- memcpy(tbuf, msg->seekadr, msg->txtlen + 1); /* Room to null */
+ if ((tbuf = (char *) malloc(msg->txtlen + 1)) == NULL)
+ err(1, NULL);
+ memcpy(tbuf, msg->seekadr, msg->txtlen + 1); /* Room to null */
s = tbuf;
- nonfirst=0;
- while (s - tbuf < msg->txtlen) /* read line at a time */
- { tape=iotape; /* restart decryption tape */
- for (numst=s; (*s^= *tape++)!=TAB; s++); /* get number */
+ nonfirst = 0;
+ while (s - tbuf < msg->txtlen) { /* read line at a time */
+ tape = iotape; /* restart decryption tape */
+ for (numst = s; (*s ^= *tape++) != TAB; s++); /* get number */
- save = *s; /* Temporarily trash the string (cringe) */
- *s++ = 0; /* decrypting number within the string */
+ /* Temporarily trash the string (cringe) */
+ *s++ = 0; /* decrypting number within the string */
- if (atoi(numst) != 100 * skip && skip >= 0)
- { while ((*s++^*tape++)!=LF) /* flush the line */
- if (*tape==0) tape=iotape;
+ if (atoi(numst) != 100 * skip && skip >= 0) {
+ while ((*s++ ^ *tape++) != LF) /* flush the line */
+ if (*tape == 0)
+ tape = iotape;
continue;
}
- if ((*s^*tape)=='>' && (*(s+1)^*(tape+1))=='$' &&
- (*(s+2)^*(tape+2))=='<') break;
- if (blklin && ! nonfirst++) putchar('\n');
- do
- { if (*tape==0) tape=iotape;
- putchar(*s^*tape);
- } while ((*s++^*tape++)!=LF); /* better end with LF */
- if (skip<0) break;
+ if ((*s ^ *tape) == '>' && (*(s + 1) ^ *(tape + 1)) == '$' &&
+ (*(s + 2) ^ *(tape + 2)) == '<')
+ break;
+ if (blklin && !nonfirst++)
+ putchar('\n');
+ do {
+ if (*tape == 0)
+ tape = iotape;
+ putchar(*s ^ *tape);
+ } while ((*s++ ^ *tape++) != LF); /* better end with LF */
+ if (skip < 0)
+ break;
}
free(tbuf);
}
git.ckatri.com / bsdgames-darwin.git / blobdiff