Only in source: README.kenji
diff -r source/conf/Makefile ../ingres.ptf/source/conf/Makefile
71c71
< INGRES=	/usr/ingres
---
> INGRES=	../..
80c80
< SYSBIN=	/usr/local/bin
---
> SYSBIN=	/usr/local
82c82
< SYSLIB=	/usr/lib
---
> SYSLIB=	/usr/local/lib
84c84
< CPUTYPE=VAX
---
> CPUTYPE=SUN
112d111
< EXTRALIB=
117c116
< CFLAGS=	-O -I$H -Dbsd386
---
> CFLAGS=	-I$H -O
119d117
< 
146c144
< 	$(CC) $(LDFLAGS) version.o $@.o $(DBULIB) $(OTHERS) $(ALLLIB) $(EXTRALIB) ../dbu/create.o ../gutil/oatoi.o -o $@
---
> 	$(CC) $(LDFLAGS) version.o $@.o $(DBULIB) $(OTHERS) $(ALLLIB) -o $@
153c151
< 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(ALLLIB) $(EXTRALIB) -o $@
---
> 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(ALLLIB) -o $@
160c158
< 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(MONITOR) $(CTLMOD) $(IUTIL) $(GUTIL) $(EXTRALIB) -o $@
---
> 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(MONITOR) $(CTLMOD) $(IUTIL) $(GUTIL) -o $@
167c165
< 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(SYSMONITOR) $(CTLMOD) $(IUTIL) $(GUTIL) $(EXTRALIB) -o $@
---
> 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(SYSMONITOR) $(CTLMOD) $(IUTIL) $(GUTIL) -o $@
176c174
< 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(ALLLIBS) $(MATH) $(EXTRALIB) -o $@
---
> 	$(CC) $(LDFLAGS) version.o $@.o $(OTHERS) $(ALLLIBS) $(MATH) -o $@
diff -r source/conf/monitor.c ../ingres.ptf/source/conf/monitor.c
1d0
< # include       <ingres.h>
20,22d18
< 
< DESC	Btreesec;
< int	Btree_fd;
diff -r source/ctlmod/Makefile ../ingres.ptf/source/ctlmod/Makefile
7c7
< INGRES=	/usr/ingres
---
> INGRES=	../..
92c92
< 	ctags  $(SRCS1) $(SRCS2) $(HDRS)
---
> 	ctags  $(SRCS) $(HDRS)
diff -r source/ctlmod/call.c ../ingres.ptf/source/ctlmod/call.c
11,15d10
< int   call();
< int   calln();
< int   call_setup();
< extern  int   resetp();
< 
61d55
< int
83d76
< int
95c88
< # endif xMONITOR
---
> # endif MONITOR
194d186
< int
diff -r source/ctlmod/call_fn.c ../ingres.ptf/source/ctlmod/call_fn.c
7,8d6
< int   call_fn();
< 
36d33
< int
diff -r source/ctlmod/cm_cleanup.c ../ingres.ptf/source/ctlmod/cm_cleanup.c
35c35
< 	extern	void		rubcatch();
---
> 	extern			rubcatch();
diff -r source/ctlmod/main.c ../ingres.ptf/source/ctlmod/main.c
8d7
< # include       <access.h>
47d45
< **
63c61
< extern struct out_arg	Out_arg;	/* output arguments */
---
> struct out_arg	Out_arg;	/* output arguments */
69,74d66
< extern	void	rubcatch();
< extern	int	error();
< extern pb_t	*MonPpb;
< extern long	CmOfiles;	/* defined in markopen.c */
< 
< 
84a77,78
> 	extern		rubcatch();
> 	extern		error();
85a80,81
> 	extern pb_t	*MonPpb;
> 	extern long	CmOfiles;	/* defined in markopen.c */
157c153
<                                 if ( setdbl(wait_action,lock_type) < 0 )
---
> 				if ( setdbl(wait_action,lock_type) < 0 )
311,314d306
< **
< **      This module should be renamed to compile the stuffs in the ../support
< **          directory, because the latter modules also define rubproc() in
< **          a different manner.
317d308
< void
diff -r source/ctlmod/pb_read.c ../ingres.ptf/source/ctlmod/pb_read.c
39c39
< 	extern void	(*ExitFn)();
---
> 	extern int	(*ExitFn)();
diff -r source/ctlmod/proc_err.c ../ingres.ptf/source/ctlmod/proc_err.c
7,17d6
< int  proc_err();
< extern int pb_prime();
< extern int pb_flush();
< extern int pb_dump();
< extern int send_off();
< extern int resetp();
< 
< extern char		*Proc_name;
< extern pb_t		*MonPpb;
< 
< 
52c41
< int
---
> 
58a48
> 	extern char		*Proc_name;
60a51
> 	extern pb_t		*MonPpb;
diff -r source/ctlmod/readinput.c ../ingres.ptf/source/ctlmod/readinput.c
11,21d10
< int   readinput();
< int   read_arg();
< extern  int   markbuf();
< extern  int   pb_prime();
< extern  int   pb_get();
< extern  int   pb_dump();
< extern  int   proc_err();
< extern char	*need();
< extern QTREE	*readqry();
< 
< 
48,49d36
< 
< int
155c142
< int
---
> 
164a152,153
> 	extern char	*need();
> 	extern QTREE	*readqry();
diff -r source/ctlmod/readqry.c ../ingres.ptf/source/ctlmod/readqry.c
12,25d11
< QTREE   *readqry();
< bool	leaf();
< 
< extern QTREE	*readtree();
< extern QTREE	*trbuild();
< extern QTREE	*readsym();
< extern char	*need();
< extern char	*xalloc();
< extern int      clrrange();
< extern int      declare();
< extern int      markbuf();
< extern int      freebuf();
< extern int      nodepr();
< 
47a34,36
> 	extern QTREE	*readtree();
> 	extern char	*xalloc();
> 	extern QTREE	*trbuild();
48a38
> 	extern QTREE	*readsym();
122a113
> 	extern char	*need();
189a181
> 	extern char	*need();
234a227
> 	extern bool	leaf();
diff -r source/ctlmod/resetp.c ../ingres.ptf/source/ctlmod/resetp.c
8,10d7
< int   resetp();
< extern char	*Proc_name;
< 
32c29
< int
---
> 
34a32
> 	extern char	*Proc_name;
diff -r source/ctlmod/send_off.c ../ingres.ptf/source/ctlmod/send_off.c
7,9d6
< # include	<ingres.h>
< # include	<aux.h>
< # include	<access.h>
14,22d10
< int  send_off();
< int  send_arg();
< extern	int pb_put();
< extern	int closecatalog();
< extern  int pb_dump();
< extern  int freebuf();
< extern  int pb_tput();
< extern  int writeqry();
< 
51d38
< int
120d106
< int
125a112
> 	extern		pb_put();
diff -r source/ctlmod/sysdump.c ../ingres.ptf/source/ctlmod/sysdump.c
14,15c14,15
< extern void	null_fn();
< extern void	dump_cm();
---
> extern int	null_fn();
> extern int	dump_cm();
84d83
< void
91c90
<         register proc_t	        *pr;
---
> 	register proc_t		*pr;
diff -r source/ctlmod/treepr.c ../ingres.ptf/source/ctlmod/treepr.c
9,12d8
< int        treepr();
< static int rcsvtrpr();
< int        nodepr();
< 
28d23
< int
110d104
< int
diff -r source/dbu/Makefile ../ingres.ptf/source/dbu/Makefile
7c7
< INGRES=	/usr/ingres
---
> INGRES=	../..
38c38,39
< CFLAGS=	-O -I$H -I../ctlmod -Dbsd386
---
> RANLIB=	ranlib
> CFLAGS=	-I$H -O -I../ctlmod
53a55
> 	$(RANLIB) dbulib
56a59
> 	$(RANLIB) $(LIB)/dbulib
62a66
> 	$(RANLIB) sysmonlib
65a70
> 	$(RANLIB) $(LIB)/sysmonlib
diff -r source/dbu/copy.c ../ingres.ptf/source/dbu/copy.c
29c29
< extern void	null_fn();
---
> extern int	null_fn();
113c113
< 	void		copydone();
---
> 	int		copydone();
264d263
< void
915d913
< 	char			*dumvalue();
diff -r source/dbu/create.c ../ingres.ptf/source/dbu/create.c
16c16
< extern	void	null_fn();
---
> extern	int	null_fn();
52,54d51
< extern int   errno;
< extern DESC   Reldes, Attdes;
< 
116a114,116
> 	extern char		*Usercode;
> 	extern DESC		Reldes, Attdes;
> 	extern int		errno;
diff -r source/dbu/destroy.c ../ingres.ptf/source/dbu/destroy.c
13c13
< extern 	void	null_fn();
---
> extern 	int	null_fn();
diff -r source/dbu/display.c ../ingres.ptf/source/dbu/display.c
24c24
< extern void	null_fn();
---
> extern int	null_fn();
diff -r source/dbu/help.c ../ingres.ptf/source/dbu/help.c
15c15
< extern void	null_fn();
---
> extern int	null_fn();
203c203
< 		naa = ztack(Pathname, "/doc/naa");
---
> 		naa = ztack(Pathname, "/doc/iaa");
diff -r source/dbu/index.c ../ingres.ptf/source/dbu/index.c
16c16
< extern void	null_fn();
---
> extern int	null_fn();
56d55
< int
diff -r source/dbu/ksort.c ../ingres.ptf/source/dbu/ksort.c
32,35d31
< int	ksort();
< extern void	null_fn();
< extern int	cmpa();
< 
36a33,34
> extern int	ksort();
> extern int	null_fn();
65a64
> extern int		cmpa();
73d71
< int
541d538
<         char                    *setfil();
608d604
<         char     *setfil();
diff -r source/dbu/modify.c ../ingres.ptf/source/dbu/modify.c
20,21c20,21
< int	modify();
< extern 	void	null_fn();
---
> extern	int	modify();
> extern 	int	null_fn();
1622d1621
<         extern int    create();
diff -r source/dbu/print.c ../ingres.ptf/source/dbu/print.c
16c16
< extern	void	null_fn();
---
> extern	int	null_fn();
diff -r source/dbu/resetrel.c ../ingres.ptf/source/dbu/resetrel.c
13c13
< extern	void	null_fn();
---
> extern	int	null_fn();
diff -r source/dbu/rmqm.c ../ingres.ptf/source/dbu/rmqm.c
23c23
< extern	void	null_fn();
---
> extern	int	null_fn();
diff -r source/dbu/rupdate.c ../ingres.ptf/source/dbu/rupdate.c
10c10
< extern	void	null_fn();
---
> extern	int	null_fn();
diff -r source/dbu/save.c ../ingres.ptf/source/dbu/save.c
6d5
< # ifndef bsd386          /*  by  K.Okamoto   */
10d8
< # endif bsd386
18c16
< extern	void	null_fn();
---
> extern	int	null_fn();
62d59
< # ifndef bsd386                          /*  by   K.Okamoto   */
68,71c65
< # else bsd386                           /*  by   K.Okamoto     */
< 	extern int	timezone;	/* defined by ctime(3) */
< # endif
< /*	extern int	dysize();	 ditto */ 
---
> 	extern int	dysize();	/* ditto */
124,125c118
< # ifndef bsd386                        /*  by   K.Okamoto   */
< # if defined(xV7_UNIX)
---
> # ifdef xV7_UNIX
131,133d123
< # else bsd386                         /*   by  K.Okamoto   */
< 	date += timezone;
< # endif
250,258d239
< }
< 
< dysize(year)
< int year;
< {
<   int days=365;
<   if (year % 4 == 0 && year % 100 != 0)
<     days=366;
<   return(days);
diff -r source/dbu/sysfunc.c ../ingres.ptf/source/dbu/sysfunc.c
11,21d10
< int	sysfunc();
< int     optn_rel();
< extern void 	null_fn();
< # ifdef xSTR1
< extern int      prvect();
< # endif
< extern int      sequal();
< extern int      initp();
< extern int      setp();
< extern int      openr();
< 
22a12,13
> extern int	sysfunc();
> extern int 	null_fn();
124d114
< int
207c197
< int
---
> 
230,232c220
< /*
< void
< rubproc()
---
> /* rubproc()
236,237c224
< }
< */
---
> } */
diff -r source/dbu/sysmon.c ../ingres.ptf/source/dbu/sysmon.c
27,28c27,28
< extern	int	systm_mon();
< extern	void	systm_init();
---
> extern		systm_mon();
> extern		systm_init();
48d47
< void
197a197
> 
201c201,203
< /*
---
> 
> 
> /*
diff -r source/decomp/Makefile ../ingres.ptf/source/decomp/Makefile
36c36
< CFLAGS=	-O -I$H 
---
> CFLAGS=	-I$H -O
diff -r source/decomp/de_init.c ../ingres.ptf/source/decomp/de_init.c
10d9
< void
46c45
< void
---
> 
64c63
< /*	return;           by  K.Okamoto     */
---
> 	return;
diff -r source/decomp/globs.h ../ingres.ptf/source/decomp/globs.h
83c83
<         SYMBOL  *constv; /* pointer to constant value symbol */
---
> 	SYMBOL	*const;	/* pointer to constant value symbol */
diff -r source/decomp/openrs.c ../ingres.ptf/source/decomp/openrs.c
257d256
< 	struct desc_tab			*desc_get();
diff -r source/decomp/qryproc.c ../ingres.ptf/source/decomp/qryproc.c
16,17c16,17
< extern	void de_init();
< extern	void de_rubproc();
---
> extern	int de_init();
> extern	int de_rubproc();
diff -r source/decomp/usubr.c ../ingres.ptf/source/decomp/usubr.c
19,26d18
< static char *getformat();
< int         domnam();
< int         lnode();
< int         dstr_rel();
< int         dstr_mark();
< int         mak_t_rel();
< QTREE       **mksqlist();
< long        rel_pages();
32d23
< int
74c65
< int
---
> 
95c86
< int
---
> 
116c107
< int
---
> 
146c137
< int
---
> 
diff -r source/equel/constants.h ../ingres.ptf/source/equel/constants.h
30c30
< # define	YYDEBUG	1		/* must ALWAYS be on-used in yyparse()*/
---
> # define	YYDEBUG			/* must ALWAYS be on-used in yyparse()*/
diff -r source/equel/prtout.c ../ingres.ptf/source/equel/prtout.c
356c356
< 				fputs("\");\nIIwrite(\"", Out_file);
---
> 				puts("\");\nIIwrite(\"", Out_file);
361c361
< 				fputs("\\\n", Out_file);
---
> 				puts("\\\n", Out_file);
377,378d376
< /*  -----------      deleted  by  K.Okamoto 
< 
390,391d387
< 
< ----------------------------------------------*/
diff -r source/gutil/Makefile ../ingres.ptf/source/gutil/Makefile
7c7
< INGRES=	/usr/ingres
---
> INGRES=	../..
10c10
< CPUTYPE1 = i386
---
> CPUTYPE=VAX
19c19
< 	min.o xfree.o bmove.$(CPUTYPE1).o perror.o locv.o capital.o
---
> 	min.o xfree.o bmove.$(CPUTYPE).o perror.o locv.o capital.o
22c22
< 	concat.c freebuf.c fota.c fullwait.c \
---
> 	concat.c freebuf.c ftoa.c fullwait.c \
29c29
< ASSRC=  bmove.VAX.s bmove.SUN.c bmove.i386.c
---
> ASSRC=  bmove.VAX.s bmove.SUN.c
33c33
< CFLAGS=	-O -I$H
---
> CFLAGS=	-I$H -O
37c37
< 
---
> RANLIB=	ranlib
Only in source/gutil: bmove.i386.c
diff -r source/gutil/freebuf.c ../ingres.ptf/source/gutil/freebuf.c
18,20d17
< int    freebuf();
< int    markbuf();
< int    seterr();
22a20,22
> 
> 
> 
46c46
< int
---
> 
68c68
< int
---
> 
97c97
< int
---
> 
diff -r source/gutil/ftoa.c ../ingres.ptf/source/gutil/ftoa.c
1,2d0
< #include <math.h>
< #include <useful.h>
8d5
< # define        MAXEXP          40
36,49d32
< 
< /*
<  * Macros for converting digits to letters and vice versa
<  */
< #define	to_digit(c)	((c) - '0')
< #define is_digit(c)	((unsigned)to_digit(c) <= 9)
< #define	to_char(n)	((n) + '0')
< 
< static char *fcvt();
< static char *ecvt();
< static char *round();
< static char *exponent();
< 
< int
65,66c48
<         char            buf[MAXEXP];    /*  K.Okamoto  */
<         char      *startp, *endp;
---
> 	extern char	*ecvt(), *fcvt();
79,82c61
< 	        startp = buf;
< 	        endp = buf + sizeof(buf);
< 		p = fcvt(value, prec, &expon, &sign, startp, endp);
< 
---
> 		p = fcvt(value, prec, &expon, &sign);
131,133c110
< 	        startp = buf;
< 	        endp = buf + sizeof(buf);
< 		p = ecvt(value, prec + 1, &expon, &sign, startp, endp);
---
> 		p = ecvt(value, prec + 1, &expon, &sign);
167,168c144
< /*	*a++ = '.';           K.Okamoto      */
<         prec++;           /*  K.Okamoto  */
---
> 	*a++ = '.';
214,485d189
< }
< 
< 
< /*-
<  * Copyright (c) 1990 The Regents of the University of California.
<  * All rights reserved.
<  *
<  * This code is derived from software contributed to Berkeley by
<  * Chris Torek.
<  *
<  * Redistribution and use in source and binary forms, with or without
<  * modification, are permitted provided that the following conditions
<  * are met:
<  * 1. Redistributions of source code must retain the above copyright
<  *    notice, this list of conditions and the following disclaimer.
<  * 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
<  *    may be used to endorse or promote products derived from this software
<  *    without specific prior written permission.
<  *
<  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
<  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
<  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
<  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
<  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
<  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
<  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
<  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
<  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
<  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
<  * SUCH DAMAGE.
<  */
< /*  the following four functions are stolen from the source code of 
<  *  function cvt() in 386bsd itself in /usr/src/lib/libc/stdio/vfprintf.c 
<  *        by  K.Okamoto 
<  */
< 
< char *
< fcvt(number, prec, expon, sign, startp, endp)
< 	double number;
< 	register int prec;
< 	int *expon, *sign;
<         char *startp, *endp;
< {
< 	register char *p, *t;
< 	register double fract;
< 	int expcnt;
< 	double integer, tmp;
< 
<         *startp = '\0';
< 	expcnt = 0;
< 	if (number < 0) {
< 		number = -number;
< 		*sign = 1;
< 	} else
< 		*sign = 0;
< 
< 	fract = modf(number, &integer);
< 
< 	/* get an extra slot for rounding. */
< 	t = ++startp;
< 
< 	/*
< 	 * get integer portion of number; put into the end of the buffer; the
< 	 * .01 is added for modf(356.0 / 10, &integer) returning .59999999...
< 	 */
< 	for (p = endp - 1; integer; ++expcnt) {
< 		tmp = modf(integer / 10, &integer);
< 		*p-- = to_char((int)((tmp + .01) * 10));
< 	}
< 	/* reverse integer into beginning of buffer */
< 	if (expcnt)
< 		for (; ++p < endp; *t++ = *p);
< 	else
< 		*t++ = '0';
< 	/*
< 	 * if precision required, add in a decimal point.
< 	 */
< 	if (prec )
< 		*t++ = '.';
< 	/* if requires more precision and some fraction left */
< 	if (fract) {
< 		if (prec)
< 			do {
< 				fract = modf(fract * 10, &tmp);
< 				*t++ = to_char((int)tmp);
< 			} while (--prec && fract);
< 		if (fract)
< 			startp = round(fract, (int *)NULL, startp,
< 			    t - 1, (char)0, sign);
< 	}
< 	for (; prec--; *t++ = '0');
<         *expon = expcnt;
< 	return ((char *)(startp));
< }
< 
< 
< char *
< ecvt(number, prec, expon, sign, startp, endp)
< 	double number;
< 	register int prec;
< 	int *expon, *sign;
<         char *startp, *endp;
< {
< 	register char *p, *t;
< 	register double fract;
< 	int expcnt, gformat;
< 	double integer, tmp;
< 
<         *startp = '\0';
< 	expcnt = gformat = 0;
< 	if (number < 0) {
< 		number = -number;
< 		*sign = 1;
< 	} else
< 		*sign = 0;
< 
< 	fract = modf(number, &integer);
< 
< 	/* get an extra slot for rounding. */
< 	t = ++startp;
< 
< 	/*
< 	 * get integer portion of number; put into the end of the buffer; the
< 	 * .01 is added for modf(356.0 / 10, &integer) returning .59999999...
< 	 */
< 	for (p = endp - 1; integer; ++expcnt) {
< 		tmp = modf(integer / 10, &integer);
< 		*p-- = to_char((int)((tmp + .01) * 10));
< 	}
< 	if (expcnt) {
< 		*t++ = *++p;
< 		if (prec)
< 			*t++ = '.';
< 		/* if requires more precision and some integer left */
< 		for (; prec && ++p < endp; --prec)
< 			*t++ = *p;
< 		/*
< 		 * if done precision and more of the integer component,
< 		 * round using it; adjust fract so we don't re-round
< 		 * later.
< 		 */
< 		if (!prec && ++p < endp) {
< 			fract = 0;
< 			startp = round((double)0, &expcnt, startp,
< 			    t - 1, *p, sign);
< 		}
< 		/* adjust expcnt for digit in front of decimal */
< 		--expcnt;
< 	}
< 	/* until first fractional digit, decrement exponent */
< 	else if (fract) {
< 		/* adjust expcnt for digit in front of decimal */
< 		for (expcnt = -1;; --expcnt) {
< 			fract = modf(fract * 10, &tmp);
< 			if (tmp)
< 				break;
< 		}
< 		*t++ = to_char((int)tmp);
< 		if (prec)
< 			*t++ = '.';
< 	}
< 	else {
< 		*t++ = '0';
< 		if (prec)
< 			*t++ = '.';
< 	}
< 	/* if requires more precision and some fraction left */
< 	if (fract) {
< 		if (prec)
< 			do {
< 				fract = modf(fract * 10, &tmp);
< 			        *t++ = to_char((int)tmp);
< 			} while (--prec && fract);
< 		if (fract)
< 			startp = round(fract, &expcnt, startp,
< 			    t - 1, (char)0, sign);
< 	}
< 	/* if requires more precision */
< 	for (; prec--; *t++ = '0');
< 	/* unless alternate flag, trim any g/G format trailing 0's */
< 	if (gformat) {
< 		while (t > startp && *--t == '0');
< 		if (*t == '.')
< 			--t;
< 		++t;
< 	}
< 	t = exponent(t, expcnt);
<         *expon = expcnt;
< 	return ((char *)(startp));
< }
< 
< static char *
< round(fract, exp, start, end, ch, sign)
< 	double fract;
< 	int *exp;
< 	register char *start, *end;
< 	char ch;
<         int *sign;
< {
< 	double tmp;
< 
< 	if (fract)
< 		(void)modf(fract * 10, &tmp);
< 	else
< 		tmp = to_digit(ch);
< 	if (tmp > 4)
< 		for (;; --end) {
< 			if (*end == '.')
< 				--end;
< 			if (++*end <= '9')
< 				break;
< 			*end = '0';
< 			if (end == start) {
< 				if (exp) {	/* e/E; increment exponent */
< 					*end = '1';
< 					++*exp;
< 				}
< 				else {		/* f; add extra digit */
< 				*--end = '1';
< 				--start;
< 				}
< 				break;
< 			}
< 		}
< 	/* ``"%.3f", (double)-0.0004'' gives you a negative 0. */
< 	else if (*sign != 0)
< 		for (;; --end) {
< 			if (*end == '.')
< 				--end;
< 			if (*end != '0')
< 				break;
< 			if (end == start)
< 				*sign = 0;
< 		}
< 	return (start);
< }
< 
< static char *
< exponent(p, exp)
< 	register char *p;
< 	register int exp;
< {
< 	register char *t;
< 	char expbuf[MAXEXP];
< 
< 	*p++ = 'E';
< 	if (exp < 0) {
< 		exp = -exp;
< 		*p++ = '-';
< 	}
< 	else
< 		*p++ = '+';
< 	t = expbuf + MAXEXP;
< 	if (exp > 9) {
< 		do {
< 			*--t = to_char(exp % 10);
< 		} while ((exp /= 10) > 9);
< 		*--t = to_char(exp);
< 		for (; t < expbuf + MAXEXP; *p++ = *t++);
< 	}
< 	else {
< 		*p++ = '0';
< 		*p++ = to_char(exp);
< 	}
< 	return (p);
diff -r source/gutil/syserr.c ../ingres.ptf/source/gutil/syserr.c
25,26c25,26
< extern	void exit(), abort();
< void	(*ExitFn)()	 = exit;
---
> extern	exit(), abort();
> int	(*ExitFn)()	 = exit;
diff -r source/h/func.h ../ingres.ptf/source/h/func.h
14,17c14,15
< /*	int		(*fn_initfn)();	 initialization function */
< /*	int		(*fn_cleanup)(); interrupt cleanup function */
< 	void		(*fn_initfn)();	/* initialization function */
< 	void		(*fn_cleanup)();/* interrupt cleanup function */
---
> 	int		(*fn_initfn)();	/* initialization function */
> 	int		(*fn_cleanup)();/* interrupt cleanup function */
diff -r source/h/ingres.h ../ingres.ptf/source/h/ingres.h
0a1
> 
27,28c28
< # ifdef i386                   /*  by   K.Okamoto   */
< /*   # ifndef sun                  by   K.Okamoto   */
---
> # ifndef	sun
134c134
< # ifdef VAX   /*  also for i386   by  K.Okamoto */
---
> # ifdef VAX
136d135
< /*	c_1	pg2, pg1, pg0, line_id;    K.Okamoto  */
139d137
< /*	c_1	line_id, pg0, pg1, pg2;    K.Okamoto  */
diff -r source/h/lock.h ../ingres.ptf/source/h/lock.h
37c37
< 					 *	=4 release all locks for pid
---
> 					 *	=release all locks for pid
diff -r source/h/opsys.h ../ingres.ptf/source/h/opsys.h
0a1,2
> #
> 
diff -r source/h/resp.h ../ingres.ptf/source/h/resp.h
16c16
< 	/* PARM	resp_rval;	 the module return value */
---
> 	/* PARM	resp_rval;	/* the module return value */
diff -r source/h/tree.h ../ingres.ptf/source/h/tree.h
207a208,211
> 
> 
> 
> 
208a213,216
> 
> 
> 
> 
diff -r source/iutil/Makefile ../ingres.ptf/source/iutil/Makefile
46c46
< CFLAGS=	-O -I$H -I../ctlmod
---
> CFLAGS=	-I$H -O -I../ctlmod
diff -r source/iutil/accbuf.c ../ingres.ptf/source/iutil/accbuf.c
34c34
< extern int	Alockdes;		/* file descriptor for lock device*/
---
> int		Alockdes;		/* file descriptor for lock device*/
diff -r source/iutil/dblocks.c ../ingres.ptf/source/iutil/dblocks.c
8d7
< 
22c21
< 	if ( tTf(28,6) ) 
---
> 	if ( tTf(28,6) )
diff -r source/iutil/getservent.c ../ingres.ptf/source/iutil/getservent.c
8c8
< #include <sccs.h>
---
> # include	<sccs.h>
14,19d13
< void        setservent();
< void        endservent();
< struct servent *getservent();
< static char *any();
< static int  myatoi();
< 
25a20
> static char *any();
27d21
< void                        /* added by K.Okamoto  */ 
38d31
< void                      /* added by K.Okamoto  */
diff -r source/iutil/ingresname.c ../ingres.ptf/source/iutil/ingresname.c
6,8d5
< extern char	*pmove();
< int  ingresname();
< 
26a24
> 	extern char	*pmove();
diff -r source/iutil/initucode.c ../ingres.ptf/source/iutil/initucode.c
148c148
< 		/* (also in initproc for system processes) */
---
> 			/* (also in initproc for system processes) */
156,176d155
< #ifndef gtty
< #define gtty(fd, argp) ioctl(fd, TIOCGETP, argp)
< #endif
< #ifndef stty
< #define stty(fd, argp) ioctl(fd, TIOCSETP, argp)
< #endif
< 
< int    initucode();
< int    db_lock();
< int    initdbpath();
< extern	void	rubcatch();
< 
< /*------ needless for 386bsd  by  K.Okamoto -------
< 	struct	passwd	*getpwnam();
< # ifdef xV7_UNIX
< 	extern char	*getenv();
< # endif xV7_UNIX
< -------------------------------------------------*/
< 
< 
< int
203a183
> 	extern		rubcatch();
206a187,190
> 	struct	passwd	*getpwnam();
> # ifdef xV7_UNIX
> 	extern char	*getenv();
> # endif xV7_UNIX
242c226
< 	Pathname = (char *)getenv("INGPATH");
---
> 	Pathname = getenv("INGPATH");
348c332
< 	if ((iop = fopen((char *)ztack(Pathname, "/files/users"), "r")) == NULL)
---
> 	if ((iop = fopen(ztack(Pathname, "/files/users"), "r")) == NULL)
426,427c410
<                 sbufp += smove(field[UF_UCODE], sbufp) + 1;
< 
---
> 		sbufp += smove(field[UF_UCODE], sbufp) + 1;
510c493
< 			i = open((char *)ztack(Dbpath, "/admin"), O_RDONLY);
---
> 			i = open(ztack(Dbpath, "/admin"), O_RDONLY);
586d568
< int
600d581
< 
627d607
< int
diff -r source/iutil/lock.c ../ingres.ptf/source/iutil/lock.c
13,14d12
< int  start_up_lock_driver();
< 
30d27
< int
71c68
< 	if ( connect(to_driver, (struct sockaddr *)&addr, sizeof (addr)) == -1 )
---
> 	if ( connect(to_driver,&addr,sizeof (addr)) == -1 )
79a77,78
> 
> 
84d82
< /*   ---- deleted by  K.Okamoto  -------------
107,109d104
< 
< -----------deleted by K.Okamoto  ------------------
< */
\ No newline at end of file
diff -r source/iutil/lockreq.c ../ingres.ptf/source/iutil/lockreq.c
2c2
< #include <ildr.h>
---
> #include "ildr.h"
9,10d8
< int   dolock();
< 
21,22d18
< 
< int
diff -r source/iutil/null_fn.c ../ingres.ptf/source/iutil/null_fn.c
65d64
< void
67a67
> 	return (0);
diff -r source/iutil/page.c ../ingres.ptf/source/iutil/page.c
9,11d8
< extern struct accbuf	*choose_buf();
< 
< 
40d36
< int
49a46,47
> 	extern struct accbuf	*choose_buf();
> 	extern long		lseek();
68d65
< 
diff -r source/iutil/printup.c ../ingres.ptf/source/iutil/printup.c
127,129c127
< 		        dbl = (double) value->f4type;
< 
< 			ftoa(dbl, buf, Out_arg.f4width, Out_arg.f4prec, Out_arg.f4style);
---
> 			ftoa(value->f4type, buf, Out_arg.f4width, Out_arg.f4prec, Out_arg.f4style);
diff -r source/iutil/replace.c ../ingres.ptf/source/iutil/replace.c
50c50
< int
---
> 
diff -r source/iutil/rub.c ../ingres.ptf/source/iutil/rub.c
45d44
< void
diff -r source/iutil/utility.c ../ingres.ptf/source/iutil/utility.c
28c28
< # ifdef VAX     /* also for i386  by  K.Okamoto  */
---
> # ifdef VAX
diff -r source/libq/IIingres.c ../ingres.ptf/source/libq/IIingres.c
42,43c42,43
< 	extern	void	IIresync();
< 	extern	void	*(IIinterrupt)(),	exit();
---
> 	extern		IIresync();
> 	extern		*(IIinterrupt)(),	exit();
diff -r source/libq/IIresync.c ../ingres.ptf/source/libq/IIresync.c
18,19c18,19
< extern	void  exit();
< void	(*IIinterrupt)() =	exit;
---
> extern	exit();
> int	(*IIinterrupt)() =	exit;
21d20
< void
diff -r source/libq/Makefile ../ingres.ptf/source/libq/Makefile
7c7
< INGRES=	/usr/ingres
---
> INGRES=	../..
28c28
< CFLAGS=	-O -I$H -I../ctlmod
---
> CFLAGS=	-I$H -I../ctlmod -O
31a32
> RANLIB=	ranlib
diff -r source/monitor/Makefile ../ingres.ptf/source/monitor/Makefile
29,30c29
< #CFLAGS=	-O -I$H  -I../ctlmod
< CFLAGS=	-I$H  -I../ctlmod
---
> CFLAGS=	-I$H -O -I../ctlmod
diff -r source/monitor/branch.c ../ingres.ptf/source/monitor/branch.c
79,84c79,83
< /*	if (rewind(Input))
<  *	{
<  *		printf("Cannot branch on a terminal\n");
<  *		return (1);
<  *	}
< */
---
> 	if (rewind(Input))
> 	{
> 		printf("Cannot branch on a terminal\n");
> 		return (1);
> 	}
diff -r source/monitor/buf.c ../ingres.ptf/source/monitor/buf.c
206c206
< 	extern void	(*ExitFn)();	/* defined in syserr.c */
---
> 	extern int	(*ExitFn)();	/* defined in syserr.c */
diff -r source/monitor/clear.c ../ingres.ptf/source/monitor/clear.c
19d18
<     char f;
29c28
< 		clrline(0);  /* removes '\n' following '\g'etc  */
---
> 		clrline(0);
diff -r source/monitor/clrline.c ../ingres.ptf/source/monitor/clrline.c
35,36c35,36
< 	Prompt = (c == '\n');
< 	if (!Prompt)              /*  next char != newline K.Okamoto */
---
> 	Prompt = c == '\n';
> 	if (!Prompt)
diff -r source/monitor/expr.c ../ingres.ptf/source/monitor/expr.c
266c266
< 	  case '\t':
---
> 	  case '/t':
diff -r source/monitor/getch.c ../ingres.ptf/source/monitor/getch.c
14c14
< **	EOF (i.e. == '\0') marker.
---
> **	EOF marker.
23c23
< 		c = '\0';           /* stands for EOF  */
---
> 		c = '\0';
26,30c26,27
< 
<         if (c == EOF)               /*  if (c < 0 )   K.Okamoto  */
< 	    c = '\0';               /*  if really EOF(-1)
<                                         This should be rewrite to permit
< 					to input 8 bit code  K.Okamoto */
---
> 	if (c < 0)
> 		c = '\0';
37c34,35
<         }
---
> 	}
> 
diff -r source/monitor/go.c ../ingres.ptf/source/monitor/go.c
30,33d29
< extern int	fgetc();
< extern char	*macro();
< 
< int
38a35
> 	extern int	fgetc();
39a37
> 	extern char	*macro();
diff -r source/monitor/include.c ../ingres.ptf/source/monitor/include.c
24,26d23
< extern char		*getfilenm();
< 
< 
33a31
> 	extern char		*getfilenm();
36c34
< 	if (f == 0)               /* stands for NULL pointer */
---
> 	if (f == 0)
diff -r source/monitor/monitor.c ../ingres.ptf/source/monitor/monitor.c
7d6
< # include       <sys/ioctl.h>      /*  K.Okamoto  */
97c96
<         0
---
> 	0
100,104d98
< extern jmp_buf	CmReset;
< extern	int	error();
< extern char	*Proc_name;
< extern int	RubLevel;
< extern	void	rubcatch();
106,107d99
< 
< int
109c101
< bool	recurs;			/* K.Okamoto Is this a recursive call? */
---
> int	recurs;			/* Is this a recursive call? */
112c104
<         time_t          *timevec;
---
> 	int		timevec[2];
114c106,110
<         pid_t           pid;
---
> 	extern jmp_buf	CmReset;
> 	extern		error();
> 	extern char	*Proc_name;
> 	extern int	RubLevel;
> 	extern		rubcatch();
117,118c113
< 	  setjmp(CmReset);
< 
---
> 		setjmp(CmReset);
130d124
< 
132a127
> 			
213c208
< 				prompt("");
---
> 				prompt(0);
218c213
< 				prompt("");
---
> 				prompt(0);
223c218
< 				prompt("");
---
> 				prompt(0);
236a232
> 
298c294
< 	*p = '\0';
---
> 	*p = 0;
317,318c313
< 	prompt(0);     /* if Prompt = !GiveEof == TRUE, show prompt and 
< 			  then fflush(stdout).    K.Okamoto      */
---
> 	prompt(0);
320,323c315,316
< 		clear(0);   /* Qbname -->truncated Qryiop, and show 
< 			     prompt 'go'  Autoclear = Notnull = 0,
< 			     K.Okamoto  */
< 	fputc(c, Qryiop);
---
> 		clear(0);
> 	putc(c, Qryiop);
diff -r source/monitor/monitor.h ../ingres.ptf/source/monitor/monitor.h
41c41
< /* include support stuff */
---
> /* \include support stuff */
diff -r source/monitor/prompt.c ../ingres.ptf/source/monitor/prompt.c
22c22
<     char	*msg;
---
> char	*msg;
diff -r source/monitor/quit.c ../ingres.ptf/source/monitor/quit.c
43,50d42
< extern void	(*ExitFn)();
< extern void	exit();
< extern int	sys_nerr;
< extern char	*sys_errlist[];
< extern char	SysIdent[];
< 
< 
< void
58a51,54
> 	extern int	(*ExitFn)();
> 	extern		exit();
> 	extern int	sys_nerr;
> 	extern char	*sys_errlist[];
59a56
> 	extern char	SysIdent[];
Only in source/monitor: test.c
Only in source/monitor: test1.c
diff -r source/monitor/ttymon.c ../ingres.ptf/source/monitor/ttymon.c
51,58c51,54
< extern  char	*Usercode;
< int	tm_mon();
< void	tm_init();
< void	tm_intr();
< extern	void	quit();
< extern  void	(*ExitFn)();
< extern  char	*getufield();
< extern  char	*mcall();
---
> extern char	*Usercode;
> extern		tm_mon();
> extern		tm_init();
> extern		tm_intr();
60,63d55
< extern  int	Equel;
< extern  jmp_buf	CmReset;
< extern  jmp_buf	GoJmpBuf;
< extern  char	SysIdent[];
79,81d70
< struct sgttyb gttydummy;      /*  K.Okamoto  */
< 
< void
87a77,79
> 	extern		quit();
> 	extern int	(*ExitFn)();
> 	extern int	Equel;
88a81,83
> 	extern char	*getufield();
> 	extern jmp_buf	CmReset;
> 	extern char	SysIdent[];
100,101c95,96
< 	ExitFn = quit;       /*  this points the exit function as quit() in this file  */
< 	set_si_buf();        /*  set stdin buffered  */
---
> 	ExitFn = quit;
> 	set_si_buf();
120c115
< 	if (Nodayfile == 0 && (Qryiop = fopen((char *)ztack(ztack(Pathname, "/files/dayfile"), VERSION), "r")) != NULL)
---
> 	if (Nodayfile == 0 && (Qryiop = fopen(ztack(ztack(Pathname, "/files/dayfile"), VERSION), "r")) != NULL)
157c152
< 	**	THIS CODE IS A KLUDGE!!!
---
> 	**	THIS CODE IS A CLUDGE!!!
167c162
< 	setbuf(stdin, NULL);   /* set stdin non-buffered */
---
> 	setbuf(stdin, NULL);
179d173
< void
191c185
< 	lseek(stdin->_file, 0L, SEEK_END);
---
> 	lseek(stdin->_file, 0L, 2);
218d211
< int
230a224
> 	extern char	*mcall();
231a226
> 	extern jmp_buf	GoJmpBuf;
283c278
< 		*p = '\0';
---
> 		*p = 0;
diff -r source/ovqp/Makefile ../ingres.ptf/source/ovqp/Makefile
13,14c13,14
< AR=	ar
< ARFLAGS=-rvu
---
> AR=	-ar
> ARFLAGS=rvu
diff -r source/ovqp/findsimps.c ../ingres.ptf/source/ovqp/findsimps.c
280,281c280,281
< *cpsym(constv, len, op)
< struct symbol	*constv;
---
> *cpsym(const, len, op)
> struct symbol	*const;
297c297
< 	cp = constv->value.sym_data.c0type;
---
> 	cp = const->value.sym_data.c0type;
352,353c352,353
< add_simp(constv, rel, attno)
< struct symbol	*constv;
---
> add_simp(const, rel, attno)
> struct symbol	*const;
365c365
< 	s->constv = constv;
---
> 	s->const = const;
385c385
< 	prsym(s->constv);
---
> 	prsym(s->const);
diff -r source/ovqp/key.c ../ingres.ptf/source/ovqp/key.c
55c55
< 					k->keysym = s->constv;
---
> 					k->keysym = s->const;
62c62
< 						prsym(s->constv);
---
> 						prsym(s->const);
126c126
< 					l->keysym = s->constv;
---
> 					l->keysym = s->const;
142c142
< 					h->keysym = s->constv;
---
> 					h->keysym = s->const;
237c237
< 						low->keysym = s->constv;
---
> 						low->keysym = s->const;
248c248
< 						high->keysym = s->constv;
---
> 						high->keysym = s->const;
254c254
< 						prsym(s->constv);
---
> 						prsym(s->const);
diff -r source/ovqp/startovqp.c ../ingres.ptf/source/ovqp/startovqp.c
23c23
<         extern	void   flptexcep();
---
> 	extern	flptexcep();
31c31
< 	signal(SIGFPE,  flptexcep);
---
> 	signal(SIGFPE, (int) flptexcep);
37d36
< void
45d43
< /*      temporaly deleted by K.Okamoto because of gcc 1.39's double
65,66d62
< -----------------temporaly deleted-------
< */
\ No newline at end of file
diff -r source/parser/Makefile ../ingres.ptf/source/parser/Makefile
34c34
< CFLAGS=	-O -I$H  -DDISTRIB
---
> CFLAGS=	-O -I$H
63,70d62
< #for non-distributed database
< #grammar.c: grammar.y
< #	grep -v "DDD" grammar.y > grammar.z
< #	$(YACC) $(YFLAGS) grammar.z
< #	mv y.tab.c grammar.c
< #	rm -f grammar.z
< 
< #for distributed database
72c64,65
< 	$(YACC) $(YFLAGS) grammar.y
---
> 	grep -v "DDD" grammar.y > grammar.z
> 	$(YACC) $(YFLAGS) grammar.z
73a67
> 	rm -f grammar.z
diff -r source/parser/att_fcn.c ../ingres.ptf/source/parser/att_fcn.c
21c21
< struct atstash	Fakesid =
---
> struct atstash	Fakesid
diff -r source/parser/control.c ../ingres.ptf/source/parser/control.c
336c336
< 	extern int	Ingerr;
---
> 	extern int	Ing_err;
371,372d370
< 	extern int	Equel;
< 	extern int	Err_fnd;
diff -r source/parser/grammar.y ../ingres.ptf/source/parser/grammar.y
30c30
< # define	YYDEBUG	1
---
> # define	YYDEBUG
53d52
< extern int                      Err_current;
Only in source/parser: grammar.z
diff -r source/parser/par_init.c ../ingres.ptf/source/parser/par_init.c
16d15
< void
diff -r source/parser/parser.c ../ingres.ptf/source/parser/parser.c
16c16
< extern void		par_init();
---
> extern int		par_init();
diff -r source/parser/tree.c ../ingres.ptf/source/parser/tree.c
757d756
< 	extern DELIMLIST	*Delimhead;
diff -r source/qrymod/d_integ.c ../ingres.ptf/source/qrymod/d_integ.c
38,39c38
< extern	void	 null_fn();
< extern          d_integ();
---
> extern		d_integ(), null_fn();
diff -r source/qrymod/d_prot.c ../ingres.ptf/source/qrymod/d_prot.c
76,77c76
< extern	void	null_fn();
< extern          d_prot();
---
> extern		d_prot(), null_fn();
diff -r source/qrymod/d_view.c ../ingres.ptf/source/qrymod/d_view.c
45,46c45
< extern	void	null_fn();
< extern          d_view();
---
> extern		d_view(), null_fn();
diff -r source/qrymod/qrymod.c ../ingres.ptf/source/qrymod/qrymod.c
36,37c36
< extern	qrymod();
< extern  void     qm_init(), null_fn();
---
> extern	qrymod(), qm_init(), null_fn();
56c55
< void
---
> 
107c106
< int
---
> 
diff -r source/support/Makefile ../ingres.ptf/source/support/Makefile
11c11
< SYSBIN=	/usr/local/bin
---
> SYSBIN=	/usr/local
19c19
< 	demodb.sh initsocket.c ildr.c ingconv.q
---
> 	demodb.sh initsocket.c ildr.c ingconv.q 
28c28,29
< LIBS3=  externs.o $(DBULIB) $(IUTIL) $(CTLMOD) $(GUTIL)
---
> LIBS4=	$(DBULIB) $(IUTIL) $(GUTIL) $(CTLMOD)
> LIBS4=  externs.o $(DBULIB) $(IUTIL) $(CTLMOD) $(GUTIL) $(IUTIL)
30c31
< CFLAGS=	-O -I$H -I../ctlmod #-DDEBUG
---
> CFLAGS=	-O -I$H -I../ctlmod
67,68c68,69
< creatdb: creatdb.o error.o prvect.o $(LIBS3)
< 	$(CC) $(LDFLAGS) creatdb.o error.o prvect.o $(LIBS3) ../iutil/closecat.o -lm -o creatdb
---
> creatdb: creatdb.o error.o prvect.o $(LIBS4)
> 	$(CC) $(LDFLAGS) creatdb.o error.o prvect.o $(LIBS4) -lm -o creatdb
72,73c73,74
< destroydb: destroydb.o $(LIBS3)
< 	$(CC) $(LDFLAGS) destroydb.o $(LIBS3) ../iutil/closecat.o -lm -o destroydb
---
> destroydb: destroydb.o $(LIBS4)
> 	$(CC) $(LDFLAGS) destroydb.o $(LIBS4) -lm -o destroydb
77,78c78,79
< helpr:	helpr.o error.o prvect.o $(LIBS3)
< 	$(CC) $(LDFLAGS) helpr.o error.o prvect.o $(LIBS3) ../iutil/closecat.o -lm -o helpr
---
> helpr:	helpr.o error.o prvect.o $(LIBS4) 
> 	$(CC) $(LDFLAGS) helpr.o error.o prvect.o $(LIBS4) -lm -o helpr
96c97
< 	$(CC) $(CFLAGS) -o ingreslock ildr.o initsocket.o
---
> 	$(CC) $(CFLAGS) -o ingreslock ildr.o initsocket.o 
105,106c106,107
< printr: printr.o error.o prvect.o $(LIBS3)
< 	$(CC) $(LDFLAGS) printr.o error.o prvect.o $(LIBS3) ../iutil/closecat.o -lm -o printr
---
> printr: printr.o error.o prvect.o $(LIBS4)
> 	$(CC) $(LDFLAGS) printr.o error.o prvect.o $(LIBS4) -lm -o printr
110,111c111,112
< purge: purge.o subs.o error.o $(LIBS3)
< 	$(CC) $(LDFLAGS) purge.o subs.o error.o $(LIBS3) -lm  -o purge
---
> purge: purge.o subs.o error.o $(LIBS4)
> 	$(CC) $(LDFLAGS) purge.o subs.o error.o $(LIBS4) -lm  -o purge
115,116c116,117
< restore: restore.o subs.o error.o $(LIBS3)
< 	$(CC) $(LDFLAGS) restore.o subs.o error.o $(LIBS3) -lm -o restore
---
> restore: restore.o subs.o error.o $(LIBS4)
> 	$(CC) $(LDFLAGS) restore.o subs.o error.o $(LIBS4) -lm -o restore
diff -r source/support/copydb.q ../ingres.ptf/source/support/copydb.q
16c16
< ##  char	Usercode[100];
---
> ##char	Usercode[100];
20c20
< extern	void	(*ExitFn)();
---
> extern	int	(*ExitFn)();
51d50
< void
104c103
< 	if ((Ifile = fopen((char *)ztack(path,"/copy.in"), "w")) == NULL)
---
> 	if ((Ifile = fopen(ztack(path,"/copy.in"), "w")) == NULL)
106c105
< 	if ((Ofile = fopen((char *)ztack(path,"/copy.out"), "w")) == NULL)
---
> 	if ((Ofile = fopen(ztack(path,"/copy.out"), "w")) == NULL)
diff -r source/support/creatdb.c ../ingres.ptf/source/support/creatdb.c
0a1
> 
11d11
< # include       <ctlmod.h>
15,46d14
< void rubproc();
< int  readdbtemp();
< int  getstat();
< int  roctal();
< int  getname();
< int  makedb();
< int  makeadmin();
< int  makefile();
< int  makereln();
< int  check();
< int  *flaglkup();
< int  flagval();
< int  changedb();
< int  readadmin();
< int  readdbtemp();
< 
< extern	char	*ztack();
< extern  int     initucode();
< extern  int     acc_init();
< extern  int     getequal();
< extern  int     bequal();
< extern  int     sequal();
< extern  int     closer();
< extern  int     ingresname();
< extern  int     create();
< extern  int     opencatalog();
< extern  int     clearkeys();
< extern  int     setkey();
< extern  int     checkadmin();
< extern  int     replace();
< 
< 
168,177d135
< struct _cm_t	Cm;		/* the system topography map */
< struct _ctx_t	Ctx;		/* the current context */
< int		Syncs[CM_MAXPROC];/* expected SYNC's from each proc */
< 
< /* General System Information */
<   jmp_buf		CmReset;	/* restart addr on interrupt */
< 
< # ifdef xMONITOR
<  struct monitor	CmMonBuf;	/* monitor buffer for CM overhead */
< # endif xMONITOR
178a137
> 
183,190c142,143
< /*  extern DESC	Reldes;        */
< DESC Reldes;
< /*  extern DESC	Attdes;        */
< DESC Attdes;
< /*   extern struct admin	Admin;      */
< extern int		errno;
< extern char		*Parmvect[];
< extern char		*Flagvect[];
---
> extern DESC	Reldes;
> extern DESC	Attdes;
198d150
< 
205d156
< 
211a163
> 
218a171,172
> 	extern struct admin	Admin;
> 	extern int		errno;
227a182,183
> 	extern char		*Parmvect[];
> 	extern char		*Flagvect[];
229c185,188
< 
---
> 	int			*flaglkup();
> 	char			*ztack();
> 	extern char		*rindex();
> # ifdef	rewinddir
231a191,194
> # else	rewinddir
> 	struct	dir		direct;
> # endif	rewinddir
> 
251,252d213
< 	        break;
< 
354a316
> 
356a319,320
> # ifdef	rewinddir
> 
365a330,342
> 
> # else	rewinddir
> 			/* make certain that it is empty */
> 			freopen(".", "r", stdin);
> 			/* Skip "." and ".." entries */
> 			fread(&direct, sizeof (struct dir), 1, stdin);
> 			fread(&direct, sizeof (struct dir), 1, stdin);
> 			while ( fread(&direct, sizeof (struct dir), 1, stdin) != EOF)
> 			{
> 				if ( direct.d_ino != 0)
> 					syserr(0, "%s is not empty", database);
> 			}
> # endif	rewinddir
390c367
< 			*(p = (char *)rindex(Dbpath, '/')) = '\0';
---
> 			*(p = rindex(Dbpath, '/')) = '\0';
491c468
< void
---
> 
552c529
< int
---
> 
692c669
< int
---
> 
813c790
< int
---
> 
865c842
< int
---
> 
938c915
< int
---
> 
1001c978,980
< int
---
> 
> 
> 
1077,1078c1056,1057
< v*/
< int
---
> */
> 
1122c1101
< int
---
> 
1162c1141
< int
---
> 
1302c1281
< int
---
> 
1391c1370
< int
---
> 
1498c1477
< int
---
> 
Only in source/support: demo
diff -r source/support/destroydb.c ../ingres.ptf/source/support/destroydb.c
7d6
< # include       <ctlmod.h>
26,38d24
< struct _cm_t	Cm;		/* the system topography map */
< struct _ctx_t	Ctx;		/* the current context */
< int		Syncs[CM_MAXPROC];/* expected SYNC's from each proc */
< 
< /* General System Information */
< 
< jmp_buf		CmReset;	/* restart addr on interrupt */
< 
< # ifdef xMONITOR
< struct monitor	CmMonBuf;	/* monitor buffer for CM overhead */
< # endif xMONITOR
< 
< 
57a44
> # ifdef	rewinddir
58a46,48
> # else	rewinddir
> 	FILE		*iop;
> # endif	rewinddir
153a144
> # ifdef	rewinddir
157a149,155
> # else	rewinddir
> 	iop = fopen(".", "r");
> 	if (iop == NULL)
> 		syserr("Cannot open dot in %s", Dbpath);
> 	clean(iop);
> 	fclose(iop);
> # endif	rewinddir
177c175,176
< int
---
> 
> # ifdef	rewinddir
199a199,214
> # else	rewinddir
> 
> clean(f)
> register FILE	*f;
> {
> 	struct direc
> 	{
> 		struct direct	d;
> 		char		null;
> 	};
> 	struct direc	cur;
> 
> #	ifdef xSTR1
> 	if (tTf(2, 0))
> 		printf("clean: ");
> #	endif
200a216,239
> 	cur.null = 0;
> 
> 	/* skip "." and ".." entries */
> 	fread(&cur, sizeof cur.d, 1, f);
> 	fread(&cur, sizeof cur.d, 1, f);
> 
> 	/* scan directory */
> 	while (fread(&cur, sizeof cur.d, 1, f) > 0)
> 	{
> 		/* skip null entries */
> 		if (cur.d.d_ino == 0)
> 			continue;
> 
> #		ifdef xSTR1
> 		if (tTf(2, 1))
> 			printf("unlinking %s\n", cur.d.d_name);
> #		endif
> 		unlink(cur.d.d_name);
> 	}
> }
> # endif	rewinddir
> 
> 
> 
205d243
< void
210d247
< 
diff -r source/support/externs.c ../ingres.ptf/source/support/externs.c
12d11
< int     QbufSize = sizeof Qbuf;
diff -r source/support/helpr.c ../ingres.ptf/source/support/helpr.c
7d6
< # include       <ctlmod.h>
12,21d10
< struct _cm_t	Cm;		/* the system topography map */
< struct _ctx_t	Ctx;		/* the current context */
< int		Syncs[CM_MAXPROC];/* expected SYNC's from each proc */
< 
< /* General System Information */
< jmp_buf		CmReset;	/* restart addr on interrupt */
< 
< # ifdef xMONITOR
< struct monitor	CmMonBuf;	/* monitor buffer for CM overhead */
< # endif xMONITOR
23,24d11
< 
< 
214c201
< void
---
> 
219d205
< 
diff -r source/support/ildr.c ../ingres.ptf/source/support/ildr.c
32,48d31
< extern  int     init_sokeet();
< int             new_proc();
< int             ilwrite();
< int             ilrma();
< int             set_lock();
< int             send_info();
< int             wait_on();
< int             wakeup();
< int             close_up();
< void            abnormal();
< static  int     ilunique();
< static  int     ilfind();
< static  int     ilrm();
< static  int     ilenter();
< static  int     ilcomp();
< static  int     ilclose();
< 
65c48
< 	void		abnormal();		/* error function */
---
> 	int		abnormal();		/* error function */
67c50
<         struct timeval        tv;               /* added by K.Okamoto  */
---
> 
87,89c70,72
< 		signal(i, abnormal);
<        	signal(SIGPIPE,SIG_IGN);	/* ignore this one, in case a process simply dies in mid stride */
<         Prog_name = *av;
---
> 		signal(i,abnormal);
> 	signal(SIGPIPE,SIG_IGN);	/* ignore this one, in case a process simply dies in mid stride */
> 	Prog_name = *av;
103,104d85
<         tv.tv_sec = 0;
<         tv.tv_usec = 0; 
116,118d96
< 
< 		num_des = select(NOFILE,&read_fd,0,0,0);
< 
120,122d97
< /*
< 		while ( (num_des = select(NOFILE,&read_fd,NULL,NULL,&tv)) == 0 )
< */
132,133d106
< 
< 
143c116
< 			** without tellng us. We go to a function to figure
---
> 			** with out tellng us. We go to a function to figure
170d142
< int
179c151
< 	if ( (fd = accept(From_server,(struct sockaddr *)&addr,&len)) != -1 )
---
> 	if ( (fd = accept(From_server,&addr,&len)) != -1 )
182c154
< 		ioctl(fd,FIONBIO,&to_ioctl);   /* set sockets to nonblocking */
---
> 		ioctl(fd,FIONBIO,&to_ioctl);
195c167
< int
---
> 
339d310
< 
346,347c317
< 
< static int
---
> static
378c348
< static int
---
> static
403,404c373
< 
< static int
---
> static
439d407
< int
458,459c426
< 
< static int
---
> static
501,502c468
< 
< static int
---
> static
525,526c491
< 
< static int
---
> static
552,553d516
< 
< int
600,601d562
< 
< int
613c574
< 	if ( select(NOFILE,NULL,&wdes,NULL,&time) != 1 )
---
> 	if ( select(NOFILE,0,&wdes,0,&time) != 1 )
642,643d602
< 
< int
664,665d622
< 
< int
694,695d650
< 
< void
702c657
< 	printf("DRIVER: error Signal No. = %d, restarting\n",sig);
---
> 	printf("DRIVER: error %d, restarting\n",sig);
705,706c660
< /*	execl("/etc/lock_driver","lock_driver","restart",0);   */
< 	execl("/etc/ingreslock","lock_driver","restart",0);
---
> 	execl("/etc/lock_driver","lock_driver","restart",0);
708c662
< 	execlp("ingreslock","lock_driver","restart",0);
---
> 	execlp("lock_driver","lock_driver","restart",0);
716,717d669
< 
< int
diff -r source/support/ingres.y ../ingres.ptf/source/support/ingres.y
162a163
> 
667,668c668
< 			if(Alockdes >= 3)      /*  added by  K.Okamoto   */
< 				close(Alockdes);
---
> 			close(Alockdes);
680a681
> 
685d685
< 
1063c1063
< 	register proc_t  	*pp;
---
> 	register proc_t		*pp;
1157d1156
< 	extern int  Status;
1274c1273
< 	register proc_t 	*pp;
---
> 	register proc_t		*pp;
1349c1348
< 	register proc_t 	*pp;
---
> 	register proc_t		*pp;
diff -r source/support/initsocket.c ../ingres.ptf/source/support/initsocket.c
13,14d12
< int    init_socket();
< 
19d16
< int
25,28d21
< 
< 
< #define notdef
< 
37c30
< #ifndef  DEBUG
---
> #ifndef	DEBUG
69,71c62
< /*	bcopy(myhost->h_addr,(char *)&addr.sin_addr,myhost->h_length);    */
< 	bcopy(myhost->h_addr,(char *)&addr.sin_addr.s_addr,myhost->h_length);
< 
---
> 	bcopy(myhost->h_addr,(char *)&addr.sin_addr,myhost->h_length);
76c67
< 	if ( bind(from_socket,(struct sockaddr_in *)&addr,len) == -1 )
---
> 	if ( bind(from_socket,&addr,len) == -1 )
82a74
> 
88c80
<         ioctl(from_socket,FIONBIO,&to_ioctl);   /* set socket to nonblocking */
---
> 	ioctl(from_socket,FIONBIO,&to_ioctl);
91,95d82
< 
< 
< 
< 
< 
diff -r source/support/printadmin.c ../ingres.ptf/source/support/printadmin.c
84c84
< void
---
> 
89d88
< 
diff -r source/support/printr.c ../ingres.ptf/source/support/printr.c
7d6
< # include       <ctlmod.h>
12,28d10
< struct _cm_t	Cm;		/* the system topography map */
< struct _ctx_t	Ctx;		/* the current context */
< int		Syncs[CM_MAXPROC];/* expected SYNC's from each proc */
< 
< /* General System Information */
< char		*Proc_name;	/* the 'name' of the currently running proc */
< char		*Fileset;	/* a unique string to make filenames from */
< char		*Database;	/* the name of the current database */
< char		*Usercode;	/* the code of the current user */
< char		*Pathname;	/* the pathname of the root of INGRES */
< int		Equel;		/* set if running an Equel program */
< int		RubLevel;	/* rubout level, -1 if ignored */
< jmp_buf		CmReset;	/* restart addr on interrupt */
< extern struct out_arg	Out_arg;	/* output arguments */
< # ifdef xMONITOR
< struct monitor	CmMonBuf;	/* monitor buffer for CM overhead */
< # endif xMONITOR
30d11
< 
39a21
> 	extern struct out_arg	Out_arg;
251c233,234
< void
---
> 
> 
diff -r source/support/prvect.c ../ingres.ptf/source/support/prvect.c
74,75c74
< /*			printf("\%o", *p++);        modified by K.O.   */
< 			printf("%o", *p++);
---
> 			printf("\%o", *p++);
diff -r source/support/purge.c ../ingres.ptf/source/support/purge.c
9d8
< # include       <ctlmod.h>
48,57d46
< struct _cm_t	Cm;		/* the system topography map */
< struct _ctx_t	Ctx;		/* the current context */
< int		Syncs[CM_MAXPROC];/* expected SYNC's from each proc */
< 
< /* General System Information */
< jmp_buf		CmReset;	/* restart addr on interrupt */
< 
< # ifdef xMONITOR
< struct monitor	CmMonBuf;	/* monitor buffer for CM overhead */
< # endif xMONITOR
64,65d52
< long		Today;
< short		tTdbu[100];
69,72c56,58
< extern void	(*ExitFn)();
< extern char	*getnxtdb();
< extern void	null_fn();
< 
---
> long		Today;
> short		tTdbu[100];
> extern int	(*ExitFn)();
80a67,68
> 	extern char	*getnxtdb();
> 	extern int	null_fn();
104c92
< void
---
> 
110a99,100
> 
> 
122a113,115
> #ifndef rewinddir
> typedef	DIR	FILE;
> #endif
140a134,136
> #ifndef rewinddir
> 	char			fnambuf[DIRSIZ + 1];
> #endif
231a228,229
> 
> #ifdef rewinddir
234a233,240
> #else rewinddir
> 		strncpy(fnambuf, dp->d_name, DIRSIZ);
> 		fnambuf[DIRSIZ] = '\0';
> 		fname = fnambuf;
> 		if (!strcmp(fname, ".") || !strcmp(fname, ".."))
> 			continue;
> #endif rewinddir
> 
diff -r source/support/restore.c ../ingres.ptf/source/support/restore.c
15d14
< # include       <ctlmod.h>
26,39d24
< 
< struct _cm_t	Cm;		/* the system topography map */
< struct _ctx_t	Ctx;		/* the current context */
< int		Syncs[CM_MAXPROC];/* expected SYNC's from each proc */
< 
< /* General System Information */
< jmp_buf		CmReset;	/* restart addr on interrupt */
< 
< # ifdef xMONITOR
< struct monitor	CmMonBuf;	/* monitor buffer for CM overhead */
< # endif xMONITOR
< 
< 
< 
69a55,58
> 
> #ifndef rewinddir
> typedef	DIR	FILE;
> #endif
82,83c71,72
< 	extern	void	(*ExitFn)();
< 	extern  void    rubproc(), exit();
---
> 	extern		(*ExitFn)();
> 	extern          rubproc(), exit();
223,224c212,213
< 	extern 	void		uperr(), (*ExitFn)();
< 	void			(*tmpfn)();
---
> 	extern 			uperr(), (*ExitFn)();
> 	int			(*tmpfn)();
226a216,218
> # ifndef rewinddir
> 	char			fnambuf[DIRSIZ+1];
> # endif
238a231
> # ifdef rewinddir
239a233,237
> # else
> 		strncpy(fnambuf, dp->d_name, DIRSIZ);
> 		fnamebuf[DIRSIZ] = '\0';
> 		fname = fnamebuf;
> # endif
280d277
< void
295d291
< void
diff -r source/support/subs.c ../ingres.ptf/source/support/subs.c
15a16,48
> #ifndef rewinddir
> typedef	DIR	FILE;
> 
> DIR *
> opendir(d)
> char *d;
> {
> 	return(fopen(d, "r"));
> }
> 
> closedir(d);
> DIR *d;
> {
> 	return(fclose(d));
> }
> 
> struct direct *
> readdir(dirp)
> DIR *dirp;
> {
> 	static struct direct direc;
> 	struct direct *d = &direc;
> 	int n;
> 
> 	n = fread(&direc, sizeof(struct direct), 1, dirp);
> 	if (n <= 0)
> 		d = NULL;
> 	return(d);
> }
> 
> #endif rewinddir
> 
> 
162a196,198
> #ifndef rewinddir
> 	static char		dbname[DIRSIZ+1];
> #endif
185a222
> #ifdef rewinddir
186a224,228
> #else
> 				strncpy(dbname, dp->d_name, DIRSIZ);
> 				dbname[DIRSIZ] = '\0';
> 				db = dbname;
> #endif
diff -r source/support/usersetup.c ../ingres.ptf/source/support/usersetup.c
35c35
<         char            code[2];
---
> 	register char	*code;
37c37
< 	FILE	*iop;
---
> 	register int	iop;
40,41c40,41
< 	extern	void	(*ExitFn)();
< 	void	sysexit();
---
> 	extern	int	(*ExitFn)();
> 	extern	int	sysexit();
52,54c52,53
<         code[0] = 'a';
<         code[1] = 'a';
< 	if ((iop = fopen("/etc/passwd", "r")) == NULL)
---
> 	code = "aa";
> 	if ((iop = (int) fopen("/etc/passwd", "r")) == NULL)
79c78
< 	if ((iop = fopen("/etc/passwd", "r")) == NULL)
---
> 	if ((iop = (int) fopen("/etc/passwd", "r")) == NULL)
93d91
< 
142,143c140,141
< 	char	*c;
< 	char	a, b;
---
> 	register char	*c;
> 	register char	a, b;
176,177d173
< 
< void
Only in source/support: y.tab.h
