Path: utzoo!utgpu!watmath!clyde!att!osu-cis!tut.cis.ohio-state.edu!rutgers!iuvax!pur-ee!ea.ecn.purdue.edu!housel From: housel@en.ecn.purdue.edu (Peter S. Housel) Newsgroups: comp.os.minix Subject: NR patches for Minix (plus 'man'), part 2/2 Message-ID: <7370@ea.ecn.purdue.edu> Date: 13 Dec 88 01:18:20 GMT Sender: housel@ea.ecn.purdue.edu Reply-To: housel@en.ecn.purdue.edu (Peter S. Housel) Organization: Purdue University Engineering Computer Network Lines: 1156 #!/bin/sh echo 'x - nrinp.c.cdif' sed 's/^X//' <<'**-nrinp.c.cdif-EOF-**' >nrinp.c.cdif X*** ../nr.orig/nrinp.c Mon Nov 28 18:12:23 1988 X--- nrinp.c Mon Dec 12 15:27:27 1988 X*************** X*** 24,29 **** X static int New_font = 0; /* Used by chfont() */ X X! extern char *expandstr(char*, char*, int); /* nrmac.c */ X! extern char *cpy( char*, char* ); /* tools.lib */ X X /*--------------------------------------------------------*/ X--- 24,29 ---- X static int New_font = 0; /* Used by chfont() */ X X! extern char *expandstr(); /* nrmac.c */ X! extern char *cpy(); /* tools.lib */ X X /*--------------------------------------------------------*/ X*************** X*** 135,139 **** X X int escape( tstart, target, copymode, inp, ifile, maxch) X! UCHAR *tstart, **target; X int (*inp)(); X FILE *ifile; X--- 135,139 ---- X X int escape( tstart, target, copymode, inp, ifile, maxch) X! char *tstart, **target; X int (*inp)(); X FILE *ifile; X*************** X*** 177,184 **** X int j; /* temporary */ X int linechar; /* line-drawing character */ X! UCHAR *bp; /* general-purpouse pointer */ X! UCHAR *dest; /* Pointer to target array */ X! UCHAR name[8]; /* string or number reg name */ X! UCHAR temp[80]; /* buffer used by itoascii() */ X /* to translate number */ X X--- 177,184 ---- X int j; /* temporary */ X int linechar; /* line-drawing character */ X! char *bp; /* general-purpouse pointer */ X! char *dest; /* Pointer to target array */ X! char name[8]; /* string or number reg name */ X! char temp[80]; /* buffer used by itoascii() */ X /* to translate number */ X X*************** X*** 385,390 **** X c = (* inp)(ifile); /* c = MS digit */ X i = (* inp)(ifile); /* i = LS digit */ X! c = toupper(c); X! i = toupper(i); X X if( !ishex(c) || !ishex(i) ) X--- 385,390 ---- X c = (* inp)(ifile); /* c = MS digit */ X i = (* inp)(ifile); /* i = LS digit */ X! if(islower(c)) c = toupper(c); X! if(islower(i)) i = toupper(i); X X if( !ishex(c) || !ishex(i) ) X*************** X*** 729,733 **** X int getline( target, copymode, inp) X int ( *inp )(); X! UCHAR *target; X { X /* Get an input line & put it into target. Get at most X--- 729,733 ---- X int getline( target, copymode, inp) X int ( *inp )(); X! char *target; X { X /* Get an input line & put it into target. Get at most X*************** X*** 751,757 **** X */ X X! register UCHAR *rp ; X! register int c ; X! UCHAR *p ; X X if( Quit ) /* Quit is set by the .ex command */ X--- 751,757 ---- X */ X X! register char *rp ; X! register int c ; X! char *p ; X X if( Quit ) /* Quit is set by the .ex command */ X*************** X*** 785,788 **** X--- 785,798 ---- X if( New_font && !ISCMD(*target) ) X { X+ do_newfont(target, p-target); X+ } X+ X+ return( !(c == EOF && p == target) ); X+ } X+ X+ int do_newfont(target, len) X+ char *target; X+ int len; X+ { X /* This is a kludge but it's the most convenient X * way to get a font change into the input stream X*************** X*** 792,796 **** X */ X X! memcpy( target+2, target, (p-target) + 1 ); X switch(New_font) X { X--- 802,806 ---- X */ X X! memcpy( target+2, target, len + 1 ); X switch(New_font) X { X*************** X*** 807,814 **** X target[1] = New_font ; X New_font = 0; X! } X! X! return( !(c == EOF && p == target) ); X! } X X /*--------------------------------------------------------*/ X--- 817,822 ---- X target[1] = New_font ; X New_font = 0; X! } X! X X /*--------------------------------------------------------*/ X*************** X*** 843,848 **** X */ X X! UCHAR line [MAXSTR] ; X! UCHAR *oiname, **omacv ; X int oinlines, oismacro ; X FILE *oifile ; X--- 851,856 ---- X */ X X! char line [MAXSTR] ; X! char *oiname, **omacv ; X int oinlines, oismacro ; X FILE *oifile ; X*************** X*** 889,893 **** X command( (char*)nifile ); X else X! text( (char*)nifile ); X } X else X--- 897,905 ---- X command( (char*)nifile ); X else X! { X! if(New_font) X! do_newfont( (char *)nifile, strlen( (char *)nifile )); X! text( (char*)nifile ); X! } X } X else **-nrinp.c.cdif-EOF-** echo 'x - nrmac.c.cdif' sed 's/^X//' <<'**-nrmac.c.cdif-EOF-**' >nrmac.c.cdif X*** ../nr.orig/nrmac.c Mon Nov 28 18:12:32 1988 X--- nrmac.c Mon Dec 12 15:09:50 1988 X*************** X*** 1,5 **** X #include X X! #include X #include "nr.h" X X--- 1,5 ---- X #include X X! #include "tools/hash.h" X #include "nr.h" X X*************** X*** 53,57 **** X MACRO; X X! typedef UCHAR LTRAP[4]; X X static LTRAP Linetrap[ MAXLTRAP+1 ]; /* Traps, indexed by line number */ X--- 53,57 ---- X MACRO; X X! typedef char LTRAP[4]; X X static LTRAP Linetrap[ MAXLTRAP+1 ]; /* Traps, indexed by line number */ X*************** X*** 85,96 **** X */ X X! extern void err ( char*, ... ); /* nrout.c */ X! extern void process ( FILE*, char*, int, char** ); /* nrinp.c */ X! extern char *skipspace( char*, int ); X! extern char *skipto ( int, char*, int ); X! extern char *getenv ( char* ); X! extern char *strsave ( char* ); X! X! extern int getline ( unsigned char*, int, int (*)() ); /* nrinp.c */ X X /*--------------------------------------------------------*/ X--- 85,96 ---- X */ X X! extern void err (); /* nrout.c */ X! extern void process (); /* nrinp.c */ X! extern char *skipspace(); X! extern char *skipto (); X! extern char *getenv (); X! extern char *strsave (); X! X! extern int getline (); /* nrinp.c */ X X /*--------------------------------------------------------*/ X*************** X*** 99,145 **** X /* MACRO-RELATED (primitives): */ X X! /*global*/ int mgetc (MACRO * ); X! /*global*/ void mwrite (MACRO *, char *); X! /*global*/ void mputc (int, MACRO *); X! /*global*/ int munlink (char * ); X! /*global*/ void mrename (char *, char * ); X! /*global*/ MACRO *mopen (char *, char * ); X! /*global*/ void mclose (MACRO* ); X X /* MACRO-RELATED (high level): */ X X! /*global*/ char *expandstr (char *,char *,int); X! /*global*/ int expand_macro (char *); X! /*global*/ int mcreate (char *,char *); X! /*global*/ int mappend (char *,char *); X! /*global*/ void mac_clean (void); X! /*global*/ int screate (char *,char *); X! /*global*/ int sappend (char *,char *); X! /*global*/ int printm (void); X X /* DIVERSION-RELATED */ X X! /*global*/ int dcreate (char *); X! /*global*/ int dappend (char *); X! /*global*/ int endiv (void); X X /* TRAP-RELATED */ X X! /*global*/ int set_linetrap (char *,int ); X! /*global*/ int movetrap (char *,int ,int ); X! /*global*/ int pr_traps (void); X! /*global*/ int do_divtrap (void); X! /*global*/ int do_linetrap (int ); X! /*global*/ int distance (void); X X /* USED LOCALLY */ X X! /*local */ void delm (char*, MACRO* ); X! /*local */ char *fname (char*, char* ); X! /*local */ void swrite (MACRO*, char* ); X! /*local */ void prnt (char*, MACRO* ); X! /*local */ int pushdiv (MACRO*, char* ); X! /*local */ MACRO *popdiv (void ); X! /*local */ int findtrap (char* ); X X /*--------------------------------------------------------*/ X--- 99,145 ---- X /* MACRO-RELATED (primitives): */ X X! /*global*/ int mgetc (); X! /*global*/ void mwrite (); X! /*global*/ void mputc (); X! /*global*/ int munlink (); X! /*global*/ void mrename (); X! /*global*/ MACRO *mopen (); X! /*global*/ void mclose (); X X /* MACRO-RELATED (high level): */ X X! /*global*/ char *expandstr (); X! /*global*/ int expand_macro (); X! /*global*/ int mcreate (); X! /*global*/ int mappend (); X! /*global*/ void mac_clean (); X! /*global*/ int screate (); X! /*global*/ int sappend (); X! /*global*/ int printm (); X X /* DIVERSION-RELATED */ X X! /*global*/ int dcreate (); X! /*global*/ int dappend (); X! /*global*/ int endiv (); X X /* TRAP-RELATED */ X X! /*global*/ int set_linetrap (); X! /*global*/ int movetrap (); X! /*global*/ int pr_traps (); X! /*global*/ int do_divtrap (); X! /*global*/ int do_linetrap (); X! /*global*/ int distance (); X X /* USED LOCALLY */ X X! /*local */ void delm (); X! /*local */ char *fname (); X! /*local */ void swrite (); X! /*local */ void prnt2 (); X! /*local */ int pushdiv (); X! /*local */ MACRO *popdiv (); X! /*local */ int findtrap (); X X /*--------------------------------------------------------*/ X*************** X*** 765,769 **** X /*--------------------------------------------------------*/ X X! static void prnt( m_name, p ) X char *m_name; X MACRO *p; X--- 765,769 ---- X /*--------------------------------------------------------*/ X X! static void prnt2( m_name, p ) X char *m_name; X MACRO *p; X*************** X*** 772,775 **** X--- 772,776 ---- X int len; X char str[80]; X+ extern long filelength(); X X if( p->buf ) X*************** X*** 820,824 **** X else X { X! ptab( Macros, prnt, 1 ); X printf( "\nThe end macro is <%s>\n", X *Endm ? Endm : "NONEXISTANT" ); X--- 821,825 ---- X else X { X! ptab( Macros, prnt2, 1 ); X printf( "\nThe end macro is <%s>\n", X *Endm ? Endm : "NONEXISTANT" ); X*************** X*** 1037,1046 **** X */ X X! register UCHAR *lp; X X if( lnum < 0 ) X lnum += PGLEN ; X X! lp = (UCHAR *)( Linetrap + lnum ); X X if( lnum < 0 || lnum > MAXLTRAP ) X--- 1038,1047 ---- X */ X X! register char *lp; X X if( lnum < 0 ) X lnum += PGLEN ; X X! lp = (char *)( Linetrap + lnum ); X X if( lnum < 0 || lnum > MAXLTRAP ) X*************** X*** 1138,1146 **** X /* Spring a line trap on line "lnum", if one exists */ X X! register UCHAR *trap ; X X if( 0 <= lnum && lnum <= MAXLTRAP ) X { X! trap = (UCHAR *)( Linetrap + lnum ); X X if( *trap ) X--- 1139,1147 ---- X /* Spring a line trap on line "lnum", if one exists */ X X! register char *trap ; X X if( 0 <= lnum && lnum <= MAXLTRAP ) X { X! trap = (char *)( Linetrap + lnum ); X X if( *trap ) **-nrmac.c.cdif-EOF-** echo 'x - nrmap.c.cdif' sed 's/^X//' <<'**-nrmap.c.cdif-EOF-**' >nrmap.c.cdif X*** ../nr.orig/nrmap.c Mon Nov 28 18:12:37 1988 X--- nrmap.c Mon Dec 12 16:41:19 1988 X*************** X*** 78,85 **** X switch(i) X { X! case LITCHAR: c=i=*src++ ; SET_LIT(i); break; X! case SOFT_HYPHEN: c=i=*src++ ; HYPHENATE(i); break; X! case ZWIDTH: i=*src++ ; c = -1; break; X! case UP_SPACE: c=i=' ' ; SETNOPAD(i); break; X } X X--- 78,85 ---- X switch(i) X { X! case LITCHAR: c = i = *src++ ; SET_LIT(i); break; X! case SOFT_HYPHEN: c = i = *src++ ; HYPHENATE(i); break; X! case ZWIDTH: i = *src++ ; c = -1; break; X! case UP_SPACE: c = i = ' ' ; SETNOPAD(i); break; X } X X*************** X*** 96,100 **** X } X X! if( c <= MAX_CHARS_IN_FONT && c != '@' ) X SETWIDTH( i ); X else X--- 96,100 ---- X } X X! if( c <= MAX_CHARS_IN_FONT /* && c != '@' */) X SETWIDTH( i ); X else **-nrmap.c.cdif-EOF-** echo 'x - nrmap.h.cdif' sed 's/^X//' <<'**-nrmap.h.cdif-EOF-**' >nrmap.h.cdif X*** ../nr.orig/nrmap.h Mon Nov 28 18:12:41 1988 X--- nrmap.h Mon Dec 12 15:09:57 1988 X*************** X*** 82,86 **** X #define WHITE(c) ( CHAR(c)==' ' && !((c) & MODE_BIT) && PADDABLE(c) ) X X! #define FVAL(c) ( (int)((UCHAR)(c)) ) X #define MVAL(c) ( (int)((((int)(c)) << 4) >> 4)) /* do sign extension */ X X--- 82,86 ---- X #define WHITE(c) ( CHAR(c)==' ' && !((c) & MODE_BIT) && PADDABLE(c) ) X X! #define FVAL(c) ( CHAR(c) ) X #define MVAL(c) ( (int)((((int)(c)) << 4) >> 4)) /* do sign extension */ X **-nrmap.h.cdif-EOF-** echo 'x - nrmsc.c.cdif' sed 's/^X//' <<'**-nrmsc.c.cdif-EOF-**' >nrmsc.c.cdif X*** ../nr.orig/nrmsc.c Mon Nov 28 18:12:46 1988 X--- nrmsc.c Mon Dec 12 15:10:00 1988 X*************** X*** 12,20 **** X typedef struct X { X! unsigned adjusting :1; /* adjustment enabled */ X! unsigned bold :1; /* boldface active */ X! unsigned fill :1; /* filling enabled */ X! unsigned italics :1; /* italics active */ X! unsigned over :1; /* overstrike active */ X X int adjmode; /* adjustment mode (.ad M) */ X--- 12,20 ---- X typedef struct X { X! unsigned char adjusting; /* adjustment enabled */ X! unsigned char bold ; /* boldface active */ X! unsigned char fill ; /* filling enabled */ X! unsigned char italics ; /* italics active */ X! unsigned char over ; /* overstrike active */ X X int adjmode; /* adjustment mode (.ad M) */ **-nrmsc.c.cdif-EOF-** echo 'x - nrout.c.cdif' sed 's/^X//' <<'**-nrout.c.cdif-EOF-**' >nrout.c.cdif X*** ../nr.orig/nrout.c Mon Nov 28 18:12:55 1988 X--- nrout.c Mon Dec 12 15:10:08 1988 X*************** X*** 12,16 **** X #include X #include X! #include /* used by va_list, etc.: Microsoft-supplied */ X X #include "nr.h" X--- 12,16 ---- X #include X #include X! #include "stdarg.h" /* used by va_list, etc.: Microsoft-supplied */ X X #include "nr.h" X*************** X*** 20,24 **** X static int Do_zero_trap = 1; X X! extern char *cpy( char*, char* ); X X /*---------------------------------------------------------- X--- 20,24 ---- X static int Do_zero_trap = 1; X X! extern char *cpy(); X X /*---------------------------------------------------------- X*************** X*** 45,49 **** X va_start( args, fmt ); X X! putc( '\007', stderr ); X X fprintf( Verbose ? stdout : stderr, "ERROR(%s%s, line %d): ", X--- 45,49 ---- X va_start( args, fmt ); X X! /* putc( '\007', stderr ); */ X X fprintf( Verbose ? stdout : stderr, "ERROR(%s%s, line %d): ", X*************** X*** 201,205 **** X X title( s ) X! UCHAR *s ; X { X /* Do a three part title: /str1/str2/str3/ X--- 201,205 ---- X X title( s ) X! char *s ; X { X /* Do a three part title: /str1/str2/str3/ X*************** X*** 216,221 **** X X int delim, ndelim ; X! UCHAR srcbuf[ MAXSTR ], *src; X! UCHAR pagenum[60]; X int i, fmt; X CTYPE destbuf[ MAXSTR ], *dest ; X--- 216,221 ---- X X int delim, ndelim ; X! char srcbuf[ MAXSTR ], *src; X! char pagenum[60]; X int i, fmt; X CTYPE destbuf[ MAXSTR ], *dest ; X*************** X*** 662,666 **** X c &= 0xff; X X! bdos( (c == '\t') ? 6 : 2 , c, 0 ); X } X } X--- 662,667 ---- X c &= 0xff; X X! putchar(c); X! /* bdos( (c == '\t') ? 6 : 2 , c, 0 ); */ X } X } X*************** X*** 737,742 **** X c = (Esc == -1) ? '\\' : Esc ; X X! else if( IS_LIT(big_c) && c == '@' ) X! c = 0 ; X X outc( c ); /* Print char and advance */ X--- 738,743 ---- X c = (Esc == -1) ? '\\' : Esc ; X X! /* else if( IS_LIT(big_c) && c == '@' ) */ X! /* c = 0 ; */ X X outc( c ); /* Print char and advance */ X*************** X*** 820,824 **** X if( !Wordstar ) /* Not in wordstar mode */ X { X! outc( '\r' ); X outc( '\n' ); X } X--- 821,825 ---- X if( !Wordstar ) /* Not in wordstar mode */ X { X! /* outc( '\r' ); */ X outc( '\n' ); X } **-nrout.c.cdif-EOF-** echo 'x - nrp.h' sed 's/^X//' <<'**-nrp.h-EOF-**' >nrp.h Xextern int comment(); Xextern int ad(); Xextern int af(); Xextern int am(); Xextern int as(); Xextern int bd(); Xextern int bo(); Xextern int bp(); Xextern int br(); Xextern int c2(); Xextern int cc(); Xextern int ce(); Xextern int cf(); Xextern int ch(); Xextern int cm(); Xextern int cu(); Xextern int da(); Xextern int db(); Xextern int de(); Xextern int df(); Xextern int di(); Xextern int ds(); Xextern int dt(); Xextern int ec(); Xextern int el(); Xextern int em(); Xextern int eo(); Xextern int ev(); Xextern int ex(); Xextern int fi(); Xextern int ft(); Xextern int hd(); Xextern int hy(); Xextern int id(); Xextern int ie(); Xextern int iff(); Xextern int ig(); Xextern int in(); Xextern int it(); Xextern int lc(); Xextern int ll(); Xextern int ls(); Xextern int lt(); Xextern int mc(); Xextern int mf(); Xextern int ml(); Xextern int na(); Xextern int nb(); Xextern int ne(); Xextern int nf(); Xextern int nh(); Xextern int nm(); Xextern int nr(); Xextern int ns(); Xextern int od(); Xextern int os(); Xextern int ou(); Xextern int pc(); Xextern int pl(); Xextern int po(); Xextern int pt(); Xextern int rd(); Xextern int rm(); Xextern int rn(); Xextern int rr(); Xextern int rs(); Xextern int so(); Xextern int sp(); Xextern int ss(); Xextern int sblock(); Xextern int eblock(); **-nrp.h-EOF-** echo 'x - nrprocs.c.cdif' sed 's/^X//' <<'**-nrprocs.c.cdif-EOF-**' >nrprocs.c.cdif X*** ../nr.orig/nrprocs.c Mon Nov 28 18:13:08 1988 X--- nrprocs.c Mon Dec 12 17:20:25 1988 X*************** X*** 16,23 **** X X extern int mgetc(), fgetc(); X extern char *skipspace(), *skipto(), *cpy(); X! extern char *strsave ( char* ); X! extern double parse ( char** ); X X static Nestlev = 0; /* .{/.} Nesting level */ X X--- 16,23 ---- X X extern int mgetc(), fgetc(); X extern char *skipspace(), *skipto(), *cpy(); X! extern char *strsave (); X! extern long parse (); X X static Nestlev = 0; /* .{/.} Nesting level */ X X*************** X*** 506,512 **** X static FONT *lastfont = &Fonts[0]; X int i, existing ; X FILE *stream; X! UCHAR *malloc(); X X if( !*lstr ) X { X--- 506,512 ---- X static FONT *lastfont = &Fonts[0]; X int i, existing ; X FILE *stream; X! char *malloc(); X X if( !*lstr ) X { X*************** X*** 1138,1145 **** X * implied by N). If N is missing or 0, 2 is used. X */ X X! static UCHAR buf[21]; X! UCHAR *p; X X if( !*str ) X { X--- 1138,1145 ---- X * implied by N). If N is missing or 0, 2 is used. X */ X X! static char buf[21]; X! char *p; X X if( !*str ) X { X*************** X*** 1287,1293 **** X */ X X char *p; X! extern double parse(); X X if( Nm_on = *str ) X { X--- 1287,1293 ---- X */ X X char *p; X! extern long parse(); X X if( Nm_on = *str ) X { **-nrprocs.c.cdif-EOF-** echo 'x - nrtext.c.cdif' sed 's/^X//' <<'**-nrtext.c.cdif-EOF-**' >nrtext.c.cdif X*** ../nr.orig/nrtext.c Mon Nov 28 18:13:19 1988 X--- nrtext.c Mon Dec 12 15:18:42 1988 X*************** X*** 14,23 **** X typedef CTYPE QUEUE; /* Dummy typedef for queue routines */ X X- X /*--------------------------------------------------------*/ X X extern QUEUE *makequeue() ; X extern CTYPE *show_next() ; X! extern void map(CTYPE*, char*); X X /*-------------------------------------------------------- X--- 14,22 ---- X typedef CTYPE QUEUE; /* Dummy typedef for queue routines */ X X /*--------------------------------------------------------*/ X X extern QUEUE *makequeue() ; X extern CTYPE *show_next() ; X! extern void map(); X X /*-------------------------------------------------------- X*************** X*** 140,144 **** X */ X X! Last_queued = *cp & 0xff ; X X Owidth += HORIZONTAL( *cp ) ? MVAL( *cp ) : CWIDTH( *cp ) ; X--- 139,144 ---- X */ X X! if(0 == (*cp & MODE_BIT)) X! Last_queued = *cp & CHR ; X X Owidth += HORIZONTAL( *cp ) ? MVAL( *cp ) : CWIDTH( *cp ) ; X*************** X*** 393,397 **** X */ X X! hyphen( word, line-1 ); X X prevwidth += CWIDTH( TO_CTYPE('-') ); /* (1) */ X--- 393,397 ---- X */ X X! /* hyphen( word, line-1 ); */ X X prevwidth += CWIDTH( TO_CTYPE('-') ); /* (1) */ **-nrtext.c.cdif-EOF-** echo 'x - parse.c.cdif' sed 's/^X//' <<'**-parse.c.cdif-EOF-**' >parse.c.cdif X*** ../../nr.orig/tools/parse.c Mon Nov 28 18:13:33 1988 X--- parse.c Mon Dec 12 16:11:28 1988 X*************** X*** 2,6 **** X #include X #include X! #include X X /* PARSE.C Expression parser for infix desk calculator X--- 2,6 ---- X #include X #include X! /* #include */ X X /* PARSE.C Expression parser for infix desk calculator X*************** X*** 83,97 **** X */ X X! extern long atol( char * ); X! X! typedef double VTYPE; X! #define VTYPE_IS_DOUBLE 1 X X static char *Str; /* Static global varialbes */ X static char *Start_str; X X! int find (int ); /* local static subroutines */ X! int match (char * ); X! void error (char *, ... ); X VTYPE expr (); X VTYPE term (); X--- 83,97 ---- X */ X X! extern long atol(); X! X! typedef long VTYPE; X! #define VTYPE_IS_DOUBLE 0 X X static char *Str; /* Static global varialbes */ X static char *Start_str; X X! int find (); /* local static subroutines */ X! int match (); X! void error (); X VTYPE expr (); X VTYPE term (); X*************** X*** 154,158 **** X /*----------------------------------------------------------------------*/ X X! static void error( fmt, ... ) /* has a variable number of args */ X char *fmt; X { X--- 154,158 ---- X /*----------------------------------------------------------------------*/ X X! static void error( fmt ) /* has a variable number of args */ X char *fmt; X { X*************** X*** 238,241 **** X--- 238,242 ---- X VTYPE left; X static VTYPE tmp; X+ int i; X X left = constant(); X*************** X*** 336,341 **** X else X { X! rval = atof( Str ); X! X while( isdigit(*Str) || *Str == '.' ) X Str++; X--- 337,343 ---- X else X { X! #if VTYPE_IS_DOUBLE X! rval = atof( Str ); X! #endif X while( isdigit(*Str) || *Str == '.' ) X Str++; **-parse.c.cdif-EOF-** echo 'x - queue.c.cdif' sed 's/^X//' <<'**-queue.c.cdif-EOF-**' >queue.c.cdif X*** ../../nr.orig/tools/queue.c Mon Nov 28 18:13:38 1988 X--- queue.c Mon Dec 12 16:23:52 1988 X*************** X*** 16,23 **** X */ X X- #ifndef MSC_VER4 /* Microsoft C, ver. 5 */ X- # define memcpy(d,s,c) memmove(d,s,c) X- #endif X- X /*----------------------------------------------------------------------*/ X X--- 16,19 ---- X*************** X*** 200,204 **** X printf( "<-tail\n\n" ); X X! #ifdef DEBUG X printf("start =0x%x\n", qp->start ); X printf("head =%d\n", qp->head ); X--- 196,200 ---- X printf( "<-tail\n\n" ); X X! #ifdef DEBUG X printf("start =0x%x\n", qp->start ); X printf("head =%d\n", qp->head ); **-queue.c.cdif-EOF-** echo 'x - skipspac.c.cdi' sed 's/^X//' <<'**-skipspac.c.cdi-EOF-**' >skipspac.c.cdi X*** ../../nr.orig/tools/skipspac.c Mon Nov 28 18:13:47 1988 X--- skipspac.c Mon Dec 12 16:11:35 1988 X*************** X*** 4,8 **** X X char *skipspace( p, esc ) X! register unsigned char *p ; X register int esc ; X { X--- 4,8 ---- X X char *skipspace( p, esc ) X! register char *p ; X register int esc ; X { **-skipspac.c.cdi-EOF-** echo 'x - stdarg.h' sed 's/^X//' <<'**-stdarg.h-EOF-**' >stdarg.h X/* stdarg.h */ X#define va_list char * X#define va_start(argp, format) argp = (char *)&format + sizeof(format) X#define va_arg(argp, type) ((type *)(argp += sizeof(type)))[-1] X#define vfprintf _doprintf X#define vprintf(fmt,args) vfprintf(stdout,fmt,args) **-stdarg.h-EOF-** echo 'x - stoi.c.cdif' sed 's/^X//' <<'**-stoi.c.cdif-EOF-**' >stoi.c.cdif X*** ../../nr.orig/tools/stoi.c Mon Nov 28 18:13:55 1988 X--- stoi.c Mon Dec 12 16:11:38 1988 X*************** X*** 47,51 **** X num += ('0'<= *str && *str <= '9') ? X *str - '0' : X! toupper(*str) - 'A' + 10 ; X str++; X } X--- 47,52 ---- X num += ('0'<= *str && *str <= '9') ? X *str - '0' : X! (islower(*str) ? *str - 'a' + 10 X! : *str - 'A' + 10); X str++; X } **-stoi.c.cdif-EOF-** echo 'x - strsave.c.cdif' sed 's/^X//' <<'**-strsave.c.cdif-EOF-**' >strsave.c.cdif X*** ../../nr.orig/tools/strsave.c Mon Nov 28 18:13:59 1988 X--- strsave.c Mon Dec 12 16:11:41 1988 X*************** X*** 1,4 **** X! extern char *strcpy ( char*, char* ); X! extern void *malloc ( unsigned ); X X char *strsave( str ) X--- 1,4 ---- X! extern char *strcpy (); X! extern void *malloc (); X X char *strsave( str ) **-strsave.c.cdif-EOF-** echo 'x - switchar.c.cdi' sed 's/^X//' <<'**-switchar.c.cdi-EOF-**' >switchar.c.cdi X*** ../../nr.orig/tools/switchar.c Mon Nov 28 18:14:03 1988 X--- switchar.c Mon Dec 12 16:11:44 1988 X*************** X*** 1,16 **** X! int switchar() X! { X! /* Returns the first character in the SWITCHAR environment X! * if one is defined, else returns '-'. X! */ X! X! register char *env; X! extern char *getenv(); X! X! if( !(env = getenv("SWITCHAR")) || !*env ) X! return '-'; X! else X! return (int)*env ; X! X! } X! X--- 1 ---- X! int switchar() {return '-';} **-switchar.c.cdi-EOF-** echo 'x - tmac.an' sed 's/^X//' <<'**-tmac.an-EOF-**' >tmac.an X.\" '-man' macros for NR X.\" author: Peter S. Housel May 1988 X.ds S "" X.de _R \" reset font and size, do tab if necessary X.if \\n(_I \{\ X.\" X\T X.DT X.rr _I \} X.ft R X.. X.de B \" boldface X.ft B X.ie \\n(.$==0 .it 1 _R X.el \\$1\\$2\\$3\\$4\\$5\\$6\\fR\\*S X.. X.de BI \" alternate bold and italic X.ft B X.ie \\n(.$==0 .it 1 _R X.el \\$1\\fI\\$2\\fB\\$3\\fI\\$4\\fB\\$5\\fI\\$6\\fR\\*S X.. X.de BR \" alternate bold and Roman X.ft B X.ie \\n(.$==0 .it 1 _R X.el \\$1\\fR\\$2\\fB\\$3\\fR\\$4\\fB\\$5\\fR\\$6\\fR\\*S X.. X.de DT \" restore default tabs X.ta 8 +8 +8 +8 +8 +8 +8 +8 +8 +8 +8 +8 X.. X.de _P \" set prevailing indent X.if !'\\$1'' .nr _P \\$1 X.in \\n(_P X.. X.de HP \" hanging indent paragraph X._P \\$1 X.ti 0 X.. X.de I \" italicize X.ft I X.ie \\n(.$==0 .it 1 _R X.el \\$1\\$2\\$3\\$4\\$5\\$6\\fR\\*S X.. X.de IB \" alternate italic and bold X.ft I X.ie \\n(.$==0 .it 1 _R X.el \\$1\\fB\\$2\\fI\\$3\\fB\\$4\\fI\\$5\\fB\\$6\\fR\\*S X.. X.de IP \" indented paragraph with hanging tag argument X.TP \\$2 X\\$1 X.. X.de IR \" alternate italic and Roman X.ft I X.ie \\n(.$==0 .it 1 _R X.el \\$1\\fR\\$2\\fI\\$3\\fR\\$4\\fI\\$5\\fR\\$6\\fR\\*S X.. X.de LP \" paragraph X.PP X.. X.de PD \" set interparagraph distance X.ie \\n(.$==0 .nr PD 1 X.el .nr PD \\$1 X.. X.de PP \" new paragraph X\fR\*S X.sp \\n(PD X._P 5 X.. X.de RE \" end of relative indent X.in -\\n(RS X.. X.de RB \" alternate Roman and bold X.ft R X.ie \\n(.$==0 .it 1 _R X.el \\$1\\fB\\$2\\fR\\$3\\fB\\$4\\fR\\$5\\fB\\$6\\fR\\*S X.. X.de RI \" alternate Roman and italic X.ft R X.ie \\n(.$==0 .it 1 _R X.el \\$1\\fI\\$2\\fR\\$3\\fI\\$4\\fR\\$5\\fI\\$6\\fR\\*S X.. X.de RS \" start relative indent X.ie \\n(.$==0 .nr RS \\n(_P X.el .nr RS \\$1 X.in +\\n(RS X.. X.de _S \" subhead trap X\fR\*S X.br X.. X.de SH \" subhead X.sp 1 X._P X.ti 0 X.ft B X.ie \\n(.$==0 .it 1 _S X.el \\$1 \\$2 \\$3 \\$4 \\$5 \\$6\\fR\\*S X.br X.. X.de SM \" small X.\".ps -2 X.ie \\n(.$==0 .it 1 _R X.el \\$1\\$2\\$3\\$4\\$5\\$6\\fR\\*S X.. X.de TH \" title X.ds _N \\$1 X.ds _C \\$2 X._P 5 X.DT X.. X.de TP \" indented paragraph with hanging tag X.ie !'\\$1'' .nr _I \\$1 X.el .nr _I 5 X.sp \\n(PD X.in \\n(_I+\\n(_P X.ti -\\n(_I X.ta \\n(_I X.it 1 _R X.. X.de _H \" header macro X.ev 1 X.sp 2 X.tl |\\*(_N(\\*(_C)|MINIX Programmer's Manual|\\*(_N(\\*(_C)| X.sp 2 X.ev X.. X.de _F \" footer macro X.ev 1 X.sp 2 X.tl |Glerptic edition||%| X.bp X.ev X.. X.wh 0 _H X.wh -6 _F X.TH XX 0 X.ds R "(Reg)" X.PD **-tmac.an-EOF-** exit 0