Fresh Fish 2

home *** CD-ROM | disk | FTP | other *** search

/ Fresh Fish 2 / FFMCD02.bin / useful / dist / gnu / textutils / textutils-1.9.diffs next >

Wrap

Text File | 1993-12-14 | 20.0 KB | 911 lines

diff -rc textutils-1.9-fsf/Makefile.in textutils-1.9-amiga/Makefile.in *** textutils-1.9-fsf/Makefile.in Thu Oct 21 17:52:51 1993 --- textutils-1.9-amiga/Makefile.in Tue Dec 14 09:27:17 1993 *************** *** 25,31 **** srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib --- 25,31 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib diff -rc textutils-1.9-fsf/configure textutils-1.9-amiga/configure *** textutils-1.9-fsf/configure Tue Nov 2 21:02:43 1993 --- textutils-1.9-amiga/configure Tue Dec 14 09:25:53 1993 *************** *** 69,75 **** *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;; *) val=1 ;; esac ! eval "with_$package='$val'" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v) verbose=yes ;; --- 69,75 ---- *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;; *) val=1 ;; esac ! "with_$package='$val'" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v) verbose=yes ;; *************** *** 91,97 **** rm -f conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h ! compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1' # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. --- 91,97 ---- rm -f conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h ! compile="${CC-gcc} $CFLAGS conftest.c -o conftest $LIBS" # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. *************** *** 102,108 **** srcdirdefaulted=yes # Try the directory containing this script, then `..'. prog=$0 ! confdir=`echo $prog|sed 's%/[^/][^/]*$%%'` test "X$confdir" = "X$prog" && confdir=. srcdir=$confdir if test ! -r $srcdir/$unique_file; then --- 102,108 ---- srcdirdefaulted=yes # Try the directory containing this script, then `..'. prog=$0 ! confdir=`echo $prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'` test "X$confdir" = "X$prog" && confdir=. srcdir=$confdir if test ! -r $srcdir/$unique_file; then *************** *** 131,136 **** --- 131,138 ---- # We want these before the checks, so the checks can modify their values. + CFLAGS="-O" #HACK (fnf) + LDFLAGS="" #HACK (fnf) test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1 test -z "$LDFLAGS" && LDFLAGS=-g *************** *** 157,163 **** yes #endif EOF ! ${CC-cc} -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. fi --- 159,165 ---- yes #endif EOF ! ${CC-gcc} -E conftest.c > conftest.out 2>&1 if egrep yes conftest.out >/dev/null 2>&1; then GCC=1 # For later tests. fi *************** *** 169,179 **** echo checking how to run the C preprocessor if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get ! # substituted into the Makefile and ``${CC-cc}'' will simply confuse # make. It must be expanded now. ! CPP="${CC-cc} -E" cat > conftest.c <<EOF #include "confdefs.h" #include <stdio.h> --- 171,182 ---- echo checking how to run the C preprocessor + CPP="/lib/gcc-lib/amigados/2.3.3/cpp" #HACK if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get ! # substituted into the Makefile and ``${CC-gcc}'' will simply confuse # make. It must be expanded now. ! CPP="${CC-gcc} -E" cat > conftest.c <<EOF #include "confdefs.h" #include <stdio.h> *************** *** 234,239 **** --- 237,243 ---- # /usr/ucb/install on SVR4, which tries to use the nonexistent group # `staff'. On most BSDish systems install is in /usr/bin, not /usr/ucb # anyway. Sigh. + INSTALL=/bin/ginstall #HACK (fnf) if test "z${INSTALL}" = "z" ; then echo checking for install IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" *************** *** 404,410 **** int main() { exit(0); } int t() { int i; } EOF ! if eval $compile; then rm -rf conftest* { --- 408,414 ---- int main() { exit(0); } int t() { int i; } EOF ! if $compile; then rm -rf conftest* { *************** *** 505,511 **** int main() { exit(0); } int t() { $prog } EOF ! if eval $compile; then : else rm -rf conftest* --- 509,515 ---- int main() { exit(0); } int t() { $prog } EOF ! if $compile; then : else rm -rf conftest* *************** *** 547,553 **** /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ exit(sizeof(long double) < sizeof(double)); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { --- 551,557 ---- /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ exit(sizeof(long double) < sizeof(double)); } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { *************** *** 571,577 **** #include "confdefs.h" main() { exit(sizeof(long int) != 8); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { --- 575,581 ---- #include "confdefs.h" main() { exit(sizeof(long int) != 8); } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { *************** *** 618,624 **** exit (0); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { --- 622,628 ---- exit (0); } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { *************** *** 657,663 **** exit (u.c[sizeof (long) - 1] == 1); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : else --- 661,667 ---- exit (u.c[sizeof (long) - 1] == 1); } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : else *************** *** 769,775 **** #endif } EOF ! if eval $compile; then : else rm -rf conftest* --- 773,779 ---- #endif } EOF ! if $compile; then : else rm -rf conftest* *************** *** 791,797 **** } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then test -n "$verbose" && echo " memcmp is 8-bit clean" --- 795,801 ---- } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then test -n "$verbose" && echo " memcmp is 8-bit clean" *************** *** 827,833 **** #endif } EOF ! if eval $compile; then rm -rf conftest* { test -n "$verbose" && \ --- 831,837 ---- #endif } EOF ! if $compile; then rm -rf conftest* { test -n "$verbose" && \ *************** *** 852,858 **** int main() { exit(0); } int t() { vprintf(); } EOF ! if eval $compile; then rm -rf conftest* { --- 856,862 ---- int main() { exit(0); } int t() { vprintf(); } EOF ! if $compile; then rm -rf conftest* { *************** *** 881,887 **** int main() { exit(0); } int t() { _doprnt(); } EOF ! if eval $compile; then rm -rf conftest* { --- 885,891 ---- int main() { exit(0); } int t() { _doprnt(); } EOF ! if $compile; then rm -rf conftest* { *************** *** 910,916 **** int main() { exit(0); } int t() { char *p = alloca(2 * sizeof(int)); } EOF ! if eval $compile; then rm -rf conftest* { --- 914,920 ---- int main() { exit(0); } int t() { char *p = alloca(2 * sizeof(int)); } EOF ! if $compile; then rm -rf conftest* { *************** *** 949,955 **** int main() { exit(0); } int t() { char *p = (char *) alloca(1); } EOF ! if eval $compile; then : else rm -rf conftest* --- 953,959 ---- int main() { exit(0); } int t() { char *p = (char *) alloca(1); } EOF ! if $compile; then : else rm -rf conftest* *************** *** 984,990 **** #endif } EOF ! if eval $compile; then rm -rf conftest* { test -n "$verbose" && \ --- 988,994 ---- #endif } EOF ! if $compile; then rm -rf conftest* { test -n "$verbose" && \ *************** *** 1017,1023 **** #endif } EOF ! if eval $compile; then rm -rf conftest* { test -n "$verbose" && \ --- 1021,1027 ---- #endif } EOF ! if $compile; then rm -rf conftest* { test -n "$verbose" && \ *************** *** 1050,1056 **** #endif } EOF ! if eval $compile; then rm -rf conftest* { test -n "$verbose" && \ --- 1054,1060 ---- #endif } EOF ! if $compile; then rm -rf conftest* { test -n "$verbose" && \ *************** *** 1107,1113 **** #include "confdefs.h" main(){exit(0);} EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : else --- 1111,1117 ---- #include "confdefs.h" main(){exit(0);} EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : else *************** *** 1149,1155 **** exit (find_stack_direction() < 0); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { --- 1153,1159 ---- exit (find_stack_direction() < 0); } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { *************** *** 1190,1196 **** int main() { exit(0); } int t() { struct stat s; s.st_blksize; } EOF ! if eval $compile; then rm -rf conftest* { --- 1194,1200 ---- int main() { exit(0); } int t() { struct stat s; s.st_blksize; } EOF ! if $compile; then rm -rf conftest* { *************** *** 1219,1225 **** int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* { --- 1223,1229 ---- int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if $compile; then rm -rf conftest* { *************** *** 1246,1252 **** int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* { --- 1250,1256 ---- int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if $compile; then rm -rf conftest* { *************** *** 1273,1279 **** int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* { --- 1277,1283 ---- int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if $compile; then rm -rf conftest* { *************** *** 1300,1306 **** int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* { --- 1304,1310 ---- int main() { exit(0); } int t() { DIR *dirp = 0; } EOF ! if $compile; then rm -rf conftest* { *************** *** 1326,1332 **** #include <$dirheader> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : else --- 1330,1336 ---- #include <$dirheader> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : else diff -rc textutils-1.9-fsf/man/Makefile.in textutils-1.9-amiga/man/Makefile.in *** textutils-1.9-fsf/man/Makefile.in Thu Oct 21 16:32:16 1993 --- textutils-1.9-amiga/man/Makefile.in Tue Dec 14 09:27:36 1993 *************** *** 20,26 **** srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr/local exec_prefix = $(prefix) mandir = $(prefix)/man/man1 manprefix = --- 20,26 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr exec_prefix = $(prefix) mandir = $(prefix)/man/man1 manprefix = diff -rc textutils-1.9-fsf/src/Makefile.in textutils-1.9-amiga/src/Makefile.in *** textutils-1.9-fsf/src/Makefile.in Mon Oct 25 15:36:25 1993 --- textutils-1.9-amiga/src/Makefile.in Tue Dec 14 09:27:46 1993 *************** *** 20,26 **** srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin binprefix = --- 20,26 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin binprefix = diff -rc textutils-1.9-fsf/src/cat.c textutils-1.9-amiga/src/cat.c *** textutils-1.9-fsf/src/cat.c Sat Oct 23 04:56:27 1993 --- textutils-1.9-amiga/src/cat.c Tue Dec 14 10:03:41 1993 *************** *** 119,125 **** } - void main (argc, argv) int argc; char *argv[]; --- 119,124 ---- diff -rc textutils-1.9-fsf/src/cksum.c textutils-1.9-amiga/src/cksum.c *** textutils-1.9-fsf/src/cksum.c Sat Oct 23 04:56:27 1993 --- textutils-1.9-amiga/src/cksum.c Tue Dec 14 10:03:59 1993 *************** *** 94,100 **** return rem & 0xFFFFFFFF; /* Make it run on 64-bit machine. */ } - void main () { int i; --- 94,99 ---- *************** *** 292,298 **** exit (status); } - void main (argc, argv) int argc; char **argv; --- 291,296 ---- diff -rc textutils-1.9-fsf/src/comm.c textutils-1.9-amiga/src/comm.c *** textutils-1.9-fsf/src/comm.c Sat Oct 23 04:56:28 1993 --- textutils-1.9-amiga/src/comm.c Tue Dec 14 10:04:04 1993 *************** *** 67,73 **** static void writeline (); static void usage (); - void main (argc, argv) int argc; char *argv[]; --- 67,72 ---- diff -rc textutils-1.9-fsf/src/csplit.c textutils-1.9-amiga/src/csplit.c *** textutils-1.9-fsf/src/csplit.c Fri Oct 29 17:58:19 1993 --- textutils-1.9-amiga/src/csplit.c Tue Dec 14 10:04:08 1993 *************** *** 1440,1446 **** cleanup (); } - void main (argc, argv) int argc; char **argv; --- 1440,1445 ---- diff -rc textutils-1.9-fsf/src/cut.c textutils-1.9-amiga/src/cut.c *** textutils-1.9-fsf/src/cut.c Sun Nov 7 03:51:12 1993 --- textutils-1.9-amiga/src/cut.c Tue Dec 14 10:04:14 1993 *************** *** 168,174 **** {0, 0, 0, 0} }; - void main (argc, argv) int argc; char **argv; --- 168,173 ---- diff -rc textutils-1.9-fsf/src/expand.c textutils-1.9-amiga/src/expand.c *** textutils-1.9-fsf/src/expand.c Sun Oct 24 19:42:06 1993 --- textutils-1.9-amiga/src/expand.c Tue Dec 14 10:04:18 1993 *************** *** 121,127 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 121,126 ---- diff -rc textutils-1.9-fsf/src/fold.c textutils-1.9-amiga/src/fold.c *** textutils-1.9-fsf/src/fold.c Tue Nov 2 20:46:59 1993 --- textutils-1.9-amiga/src/fold.c Tue Dec 14 10:04:22 1993 *************** *** 95,101 **** exit (status); } - void main (argc, argv) int argc; char **argv; --- 95,100 ---- diff -rc textutils-1.9-fsf/src/head.c textutils-1.9-amiga/src/head.c *** textutils-1.9-fsf/src/head.c Sun Oct 24 19:42:08 1993 --- textutils-1.9-amiga/src/head.c Tue Dec 14 10:04:28 1993 *************** *** 105,111 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 105,110 ---- diff -rc textutils-1.9-fsf/src/join.c textutils-1.9-amiga/src/join.c *** textutils-1.9-fsf/src/join.c Sat Oct 30 19:31:11 1993 --- textutils-1.9-amiga/src/join.c Tue Dec 14 10:04:32 1993 *************** *** 569,575 **** return added; } - void main (argc, argv) int argc; char *argv[]; --- 569,574 ---- diff -rc textutils-1.9-fsf/src/nl.c textutils-1.9-amiga/src/nl.c *** textutils-1.9-fsf/src/nl.c Sun Oct 24 19:42:09 1993 --- textutils-1.9-amiga/src/nl.c Tue Dec 14 10:04:40 1993 *************** *** 184,190 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 184,189 ---- diff -rc textutils-1.9-fsf/src/od.c textutils-1.9-amiga/src/od.c *** textutils-1.9-fsf/src/od.c Thu Oct 28 13:33:42 1993 --- textutils-1.9-amiga/src/od.c Tue Dec 14 10:04:45 1993 *************** *** 1684,1690 **** return err; } - int main (argc, argv) int argc; char **argv; --- 1684,1689 ---- diff -rc textutils-1.9-fsf/src/paste.c textutils-1.9-amiga/src/paste.c *** textutils-1.9-fsf/src/paste.c Sun Oct 24 19:42:13 1993 --- textutils-1.9-amiga/src/paste.c Tue Dec 14 10:04:52 1993 *************** *** 104,110 **** {0, 0, 0, 0} }; - void main (argc, argv) int argc; char **argv; --- 104,109 ---- diff -rc textutils-1.9-fsf/src/pr.c textutils-1.9-amiga/src/pr.c *** textutils-1.9-fsf/src/pr.c Sat Oct 23 04:56:39 1993 --- textutils-1.9-amiga/src/pr.c Tue Dec 14 10:05:00 1993 *************** *** 467,473 **** return n; } - void main (argc, argv) int argc; char **argv; --- 467,472 ---- diff -rc textutils-1.9-fsf/src/sort.c textutils-1.9-amiga/src/sort.c *** textutils-1.9-fsf/src/sort.c Mon Oct 25 15:36:27 1993 --- textutils-1.9-amiga/src/sort.c Tue Dec 14 10:05:10 1993 *************** *** 1444,1450 **** return s; } - void main (argc, argv) int argc; char *argv[]; --- 1444,1449 ---- diff -rc textutils-1.9-fsf/src/split.c textutils-1.9-amiga/src/split.c *** textutils-1.9-fsf/src/split.c Sun Oct 24 19:42:14 1993 --- textutils-1.9-amiga/src/split.c Tue Dec 14 10:05:15 1993 *************** *** 127,133 **** exit (status); } - void main (argc, argv) int argc; char *argv[]; --- 127,132 ---- diff -rc textutils-1.9-fsf/src/sum.c textutils-1.9-amiga/src/sum.c *** textutils-1.9-fsf/src/sum.c Sat Oct 23 04:56:44 1993 --- textutils-1.9-amiga/src/sum.c Tue Dec 14 10:05:19 1993 *************** *** 90,96 **** exit (status); } - void main (argc, argv) int argc; char **argv; --- 90,95 ---- diff -rc textutils-1.9-fsf/src/tac.c textutils-1.9-amiga/src/tac.c *** textutils-1.9-fsf/src/tac.c Sun Oct 24 19:42:16 1993 --- textutils-1.9-amiga/src/tac.c Tue Dec 14 10:05:23 1993 *************** *** 156,162 **** exit (status); } - void main (argc, argv) int argc; char **argv; --- 156,161 ---- diff -rc textutils-1.9-fsf/src/tail.c textutils-1.9-amiga/src/tail.c *** textutils-1.9-fsf/src/tail.c Sun Oct 24 19:42:17 1993 --- textutils-1.9-amiga/src/tail.c Tue Dec 14 10:05:30 1993 *************** *** 141,147 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 141,146 ---- diff -rc textutils-1.9-fsf/src/tr.c textutils-1.9-amiga/src/tr.c *** textutils-1.9-fsf/src/tr.c Sun Oct 24 18:57:29 1993 --- textutils-1.9-amiga/src/tr.c Tue Dec 14 10:05:45 1993 *************** *** 1702,1708 **** in_set[i] = (!in_set[i]); } - void main (argc, argv) int argc; char **argv; --- 1702,1707 ---- diff -rc textutils-1.9-fsf/src/unexpand.c textutils-1.9-amiga/src/unexpand.c *** textutils-1.9-fsf/src/unexpand.c Sun Oct 24 19:42:18 1993 --- textutils-1.9-amiga/src/unexpand.c Tue Dec 14 10:05:49 1993 *************** *** 123,129 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char **argv; --- 123,128 ---- diff -rc textutils-1.9-fsf/src/uniq.c textutils-1.9-amiga/src/uniq.c *** textutils-1.9-fsf/src/uniq.c Sun Oct 24 19:42:19 1993 --- textutils-1.9-amiga/src/uniq.c Tue Dec 14 10:05:53 1993 *************** *** 99,105 **** {NULL, 0, NULL, 0} }; - void main (argc, argv) int argc; char *argv[]; --- 99,104 ---- diff -rc textutils-1.9-fsf/src/wc.c textutils-1.9-amiga/src/wc.c *** textutils-1.9-fsf/src/wc.c Sat Oct 23 04:56:50 1993 --- textutils-1.9-amiga/src/wc.c Tue Dec 14 10:05:57 1993 *************** *** 104,110 **** exit (status); } - void main (argc, argv) int argc; char **argv; --- 104,109 ---- *************** *** 200,211 **** } } static void wc (fd, file) int fd; char *file; { - char buf[BUFFER_SIZE]; register int bytes_read; register int in_word = 0; register unsigned long lines, words, chars; --- 199,211 ---- } } + char buf[BUFFER_SIZE]; /* Move buffer off stack; David Gay */ + static void wc (fd, file) int fd; char *file; { register int bytes_read; register int in_word = 0; register unsigned long lines, words, chars;