diff -Nurd bible.orig/Makefile bible/Makefile --- bible.orig/Makefile 1994-12-14 20:53:00.000000000 -0500 +++ bible/Makefile 2005-12-15 22:03:55.000000000 -0500 @@ -398,30 +398,24 @@ # The "install" target could be of general use. That's why there are # no explicit dependencies here. They just confuse things... install: - @if [ ! -r $(DEST) ]; then mkdir $(DEST); fi + @if [ ! -r $(DEST) ]; then mkdir -p $(DEST); fi @echo Installing $(PROGRAM) in $(DESTBIN) @-strip $(PROGRAM) - @if [ ! -r $(DESTBIN) ]; then mkdir $(DESTBIN); fi + @if [ ! -r $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi @if [ $(DESTBIN) != . ]; then \ ((cd $(DESTBIN);rm -f $(PROGRAM)); \ cp $(PROGRAM) $(DESTBIN)); \ - chown bin $(DESTBIN)/$(PROGRAM); \ - chgrp bin $(DESTBIN)/$(PROGRAM); \ chmod 755 $(DESTBIN)/$(PROGRAM); fi @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB) - @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi + @if [ ! -r $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi @if [ $(DESTLIB) != . ]; then \ cp $(DATA) $(DATA).conc $(DESTLIB); \ - chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ - chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi - @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi + @if [ ! -r $(DESTMAN) ]; then mkdir -p $(DESTMAN); fi @echo Installing $(MAN) in $(DESTMAN1) - @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi + @if [ ! -r $(DESTMAN1) ]; then mkdir -p $(DESTMAN1); fi @if [ $(DESTMAN1) != . ]; then \ cp $(MAN) $(DESTMAN1)/$(MAN); \ - chown bin $(DESTMAN1)/$(MAN); \ - chgrp bin $(DESTMAN1)/$(MAN); \ chmod 644 $(DESTMAN1)/$(MAN); fi uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN) diff -Nurd bible.orig/bible.c bible/bible.c --- bible.orig/bible.c 1994-12-12 14:30:47.000000000 -0500 +++ bible/bible.c 2005-12-15 21:37:26.000000000 -0500 @@ -137,6 +137,7 @@ #include #include #include +#include #include "tsl.h" #include "brl.h" #include "version.h" @@ -193,6 +194,10 @@ Note that a blank line will advance one verse in current direction.\n\ "; +void cmd_list(); +void brl_init(); +void brl_close(); +int tsl_scan_concordance(); int do_concordance( word, buf ) @@ -247,7 +252,7 @@ -cmd_ANDconcordance( word ) +void cmd_ANDconcordance( word ) /*---------------------------------------------------------------------- | NAME: | cmd_ANDconcordance @@ -304,7 +309,7 @@ -cmd_ORconcordance( word ) +void cmd_ORconcordance( word ) /*---------------------------------------------------------------------- | NAME: | cmd_ORconcordance @@ -368,7 +373,7 @@ -cmd_concordance( word ) +void cmd_concordance( word ) /*---------------------------------------------------------------------- | NAME: | cmd_concordance @@ -397,7 +402,7 @@ -cmd_help() +void cmd_help() /*---------------------------------------------------------------------- | NAME: | cmd_help @@ -423,7 +428,7 @@ -cmd_inrange( range ) +void cmd_inrange( range ) /*---------------------------------------------------------------------- | NAME: | cmd_inrange @@ -492,7 +497,7 @@ -cmd_list() +void cmd_list() /*---------------------------------------------------------------------- | NAME: | cmd_list @@ -548,7 +553,7 @@ -cmd_pretty_print(verbose) +void cmd_pretty_print(verbose) /*---------------------------------------------------------------------- | NAME: | cmd_pretty_print @@ -593,7 +598,7 @@ -cmd_view() +void cmd_view() /*---------------------------------------------------------------------- | NAME: | cmd_view @@ -627,7 +632,7 @@ -cmd_write( fname ) +void cmd_write( fname ) /*---------------------------------------------------------------------- | NAME: | cmd_write @@ -665,7 +670,7 @@ -do_command( cmd ) +void do_command( cmd ) /*---------------------------------------------------------------------- | NAME: | do_command @@ -765,7 +770,7 @@ -user_input( cmd ) +void user_input( cmd ) /*---------------------------------------------------------------------- | NAME: | user_input @@ -785,7 +790,6 @@ char *cmd; { char vs[REFSZ]; - int b, c, v; /* Junk variables */ get_nonblank(cmd); @@ -812,7 +816,7 @@ -prompter() +void prompter() /*---------------------------------------------------------------------- | NAME: | prompter @@ -836,7 +840,7 @@ -usage() +void usage() /*---------------------------------------------------------------------- | NAME: | usage @@ -867,7 +871,7 @@ -main(argc, argv) +int main(argc, argv) /*---------------------------------------------------------------------- | NAME: | main @@ -987,4 +991,5 @@ } brl_close(); + exit( 0 ); } /* main */ diff -Nurd bible.orig/brl.c bible/brl.c --- bible.orig/brl.c 1994-12-12 14:15:01.000000000 -0500 +++ bible/brl.c 2005-12-15 21:32:00.000000000 -0500 @@ -141,7 +141,9 @@ \*----------------------------------------------------------------------*/ +#include #include +#include #include #include "tsl.h" #include "brl.h" @@ -298,7 +300,12 @@ ref_t verse_id( ); ref_t verse_num( ); - +void brl_close(); +void tsl_init(); +void tsl_close(); +void tsl_error(); +int tsl_gettext(); +int tsl_printtext(); /*---------------------------------------------------------------------- | @@ -987,7 +994,7 @@ { ref_t vn, vref; int vc, vcount; - int len, indent, i; + int len, indent; #define VBSIZE 512 char vb1[VBSIZE], vb2[VBSIZE]; char *srcp, *dstp, *endp; @@ -1118,7 +1125,7 @@ -brl_init( dfname, dfpath, memlimit ) +void brl_init( dfname, dfpath, memlimit ) /*---------------------------------------------------------------------- | NAME: | brl_init @@ -1154,7 +1161,7 @@ } /* brl_init */ -brl_close() +void brl_close() /*---------------------------------------------------------------------- | NAME: | brl_close diff -Nurd bible.orig/compresslib.c bible/compresslib.c --- bible.orig/compresslib.c 1989-09-14 23:34:02.000000000 -0400 +++ bible/compresslib.c 2005-12-15 21:23:26.000000000 -0500 @@ -178,6 +178,7 @@ #include #include #include +#include #define ARGVAL() (*++(*argv) || (--argc && *++argv)) @@ -267,7 +268,7 @@ -cmp_init( ) +void cmp_init( ) /*---------------------------------------------------------------------- | NAME: | cmp_init @@ -336,7 +337,7 @@ /* Does NOT update input buffer pointer */ -cmp_checkheader(inb) +int cmp_checkheader(inb) char_type *inb; { if ((*inb++ != (magic_header[0] & 0xFF)) @@ -360,7 +361,7 @@ -cmp_decompress( inb, outb, insize ) +int cmp_decompress( inb, outb, insize ) /*---------------------------------------------------------------------- | NAME: | cmp_decompress @@ -419,7 +420,7 @@ if(oldcode == -1) /* EOF already? */ return 0; /* Get out of here */ *outb++ = (char)finchar; /* first code must be 8 bits = char */ - /* putchar( (char)finchar ); /* first code must be 8 bits = char */ + /* putchar( (char)finchar ); first code must be 8 bits = char */ stackp = de_stack; while ( (code = getcode(&inb, eofchar)) > -1 ) { @@ -559,8 +560,8 @@ * 68020 'bfextu' instruction is *not* the same as the vax 'extzv'. */ { - /* register code_int code; /* d7 */ - /* register int r_off = offset, bits= n_bits; /* d6,d5 */ + /* register code_int code; d7 */ + /* register int r_off = offset, bits= n_bits; d6,d5 */ register tmp; /* d4 */ bp += (r_off >> 3); diff -Nurd bible.orig/tsl.c bible/tsl.c --- bible.orig/tsl.c 1994-12-11 22:55:31.000000000 -0500 +++ bible/tsl.c 2006-02-15 21:56:04.000000000 -0500 @@ -94,8 +94,11 @@ | \*----------------------------------------------------------------------*/ +#include #include -#include +#include +//#include +#include /* #include */ #include "tsl.h" @@ -109,8 +112,6 @@ static char rcs_ident[]="@(#)$Header: tsl.c,v 1.9 93/04/26 11:18:14 chip Exp $"; -char *malloc(); -char *strtok(); FILE *tfp; /* Text data file pointer */ FILE *cfp; /* Concordance data file pointer */ @@ -143,9 +144,11 @@ int tsl_maxbuffs; /* Maximum number of buffers we're allowed */ int tsl_maxbuffusage=0x100000; /* Max buffer mem usage (bytes) */ +void cmp_init(); +int cmp_decompress(); +int tsl_textread(); - -tsl_error( fatal, va_alist ) +void tsl_error( int fatal, char *format, ... ) /*---------------------------------------------------------------------- | NAME: | tsl_error @@ -162,15 +165,10 @@ | \*----------------------------------------------------------------------*/ -int fatal; -va_dcl { va_list ap; - char *format; - - va_start(ap); - format = va_arg(ap, char *); + va_start(ap, format); vfprintf(stderr, format, ap); putc('\n', stderr); @@ -180,7 +178,7 @@ -tsl_scan_concordance( target, sbuf, range_start, range_end ) +int tsl_scan_concordance( target, sbuf, range_start, range_end ) /*---------------------------------------------------------------------- | NAME: | tsl_scan_concordance @@ -382,7 +380,7 @@ -tsl_textread( start, vsize, vb ) +int tsl_textread( start, vsize, vb ) /*---------------------------------------------------------------------- | NAME: | tsl_textread @@ -547,7 +545,7 @@ -tsl_init(dfname, path, memlimit) +void tsl_init(dfname, path, memlimit) /*---------------------------------------------------------------------- | NAME: | tsl_init @@ -681,7 +679,7 @@ } /* tsl_init */ -tsl_close() +void tsl_close() /*---------------------------------------------------------------------- | NAME: | tsl_close @@ -694,7 +692,6 @@ \*----------------------------------------------------------------------*/ { - int i; struct buffer_rec *bufp, *nbufp; fclose( tfp); diff -Nurd bible.orig/util.c bible/util.c --- bible.orig/util.c 1993-04-26 14:18:16.000000000 -0400 +++ bible/util.c 2005-12-15 21:58:23.000000000 -0500 @@ -150,9 +150,6 @@ Univ_Int dst; int src; { - unsigned char b; - int i; - dst[0] = (src >> 8) & 0x000000ff; dst[1] = src & 0x000000ff; } /* shortuniv_assign */ @@ -201,7 +198,7 @@ Short_Univ_Int src; { - int result, i; + int result; result = 0; result |= src[0];